Update D8 and R8 to 2.0.13-dev

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

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

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I0f029a3c465ad0af554016d2f710222f76bf4f9a
diff --git a/r8.jar b/r8.jar
index 4dda0c7..5b73704 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index e2e3d4b..35a8416 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 2.0.12-dev
+# compiler_version: 2.0.13-dev
 # compiler_hash: engineering
-# pg_map_id: 5553c36
+# pg_map_id: aeba397
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -72,69 +72,47 @@
 com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer -> com.android.tools.r8.ArchiveProgramResourceProvider$a:
     void accept(com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream) -> a
 com.android.tools.r8.AssertionsConfiguration -> com.android.tools.r8.AssertionsConfiguration:
-    java.util.List entries -> a
-    1:1:void <init>(java.util.List,com.android.tools.r8.AssertionsConfiguration$1):11:11 -> <init>
-    2:3:void <init>(java.util.List):69:70 -> <init>
-    1:1:java.util.List access$000(com.android.tools.r8.AssertionsConfiguration):11:11 -> a
-    1:2:com.android.tools.r8.AssertionsConfiguration$Builder builder(com.android.tools.r8.AssertionsConfiguration):74:75 -> b
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformation transformation -> a
+    java.lang.String value -> c
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope scope -> b
+    1:4:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope,java.lang.String):37:40 -> <init>
+    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope getScope():48:48 -> getScope
+    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformation():44:44 -> getTransformation
+    1:1:java.lang.String getValue():52:52 -> getValue
 com.android.tools.r8.AssertionsConfiguration$1 -> com.android.tools.r8.AssertionsConfiguration$a:
 com.android.tools.r8.AssertionsConfiguration$AssertionTransformation -> com.android.tools.r8.AssertionsConfiguration$AssertionTransformation:
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation[] $VALUES -> a
-    1:8:void <clinit>():17:24 -> <clinit>
-    9:9:void <clinit>():14:14 -> <clinit>
-    1:1:void <init>(java.lang.String,int):15:15 -> <init>
-    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation valueOf(java.lang.String):14:14 -> valueOf
-    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation[] values():14:14 -> values
+    1:8:void <clinit>():16:23 -> <clinit>
+    9:9:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(java.lang.String,int):14:14 -> <init>
+    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation valueOf(java.lang.String):13:13 -> valueOf
+    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation[] values():13:13 -> values
+com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope -> com.android.tools.r8.AssertionsConfiguration$b:
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope ALL -> a
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope[] $VALUES -> d
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope CLASS -> c
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope PACKAGE -> b
+    1:3:void <clinit>():27:29 -> <clinit>
+    4:4:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(java.lang.String,int):26:26 -> <init>
 com.android.tools.r8.AssertionsConfiguration$Builder -> com.android.tools.r8.AssertionsConfiguration$Builder:
-    java.util.List entries -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():84:84 -> <clinit>
-    1:1:void <init>(java.util.List,com.android.tools.r8.AssertionsConfiguration$1):85:85 -> <init>
-    2:4:void <init>(java.util.List):88:90 -> <init>
-    1:4:com.android.tools.r8.AssertionsConfiguration$Builder setDefault(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):108:111 -> a
-    1:1:com.android.tools.r8.AssertionsConfiguration build():208:208 -> build
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder disable():130:130 -> disable
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder disableForClass(java.lang.String):199:199 -> disableForClass
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder disableForPackage(java.lang.String):170:170 -> disableForPackage
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder enable():121:121 -> enable
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder enableForClass(java.lang.String):190:190 -> enableForClass
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder enableForPackage(java.lang.String):157:157 -> enableForPackage
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder passthrough():136:136 -> passthrough
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder passthroughForClass(java.lang.String):203:203 -> passthroughForClass
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder passthroughForPackage(java.lang.String):174:174 -> passthroughForPackage
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setTransformation(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):101:101 -> setTransformation
-    2:2:void addEntry(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):95:95 -> setTransformation
-    2:2:com.android.tools.r8.AssertionsConfiguration$Builder setTransformation(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):101 -> setTransformation
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForClass(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):180:180 -> setTransformationForClass
-    2:2:void addEntry(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):95:95 -> setTransformationForClass
-    2:2:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForClass(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):180 -> setTransformationForClass
-    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForPackage(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):143:143 -> setTransformationForPackage
-    2:2:void addEntry(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):95:95 -> setTransformationForPackage
-    2:2:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForPackage(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):143 -> setTransformationForPackage
-com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry -> com.android.tools.r8.AssertionsConfiguration$b:
-    com.android.tools.r8.AssertionsConfiguration$ConfigurationType type -> b
-    com.android.tools.r8.AssertionsConfiguration$AssertionTransformation transformation -> a
-    java.lang.String value -> c
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String,com.android.tools.r8.AssertionsConfiguration$1):33:33 -> <init>
-    2:6:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):39:43 -> <init>
-    1:1:com.android.tools.r8.AssertionsConfiguration$ConfigurationType access$300(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry):33:33 -> a
-    2:2:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformation():47:47 -> a
-    1:1:com.android.tools.r8.AssertionsConfiguration$ConfigurationType getType():51:51 -> b
-    1:1:java.lang.String getValue():55:55 -> c
-com.android.tools.r8.AssertionsConfiguration$ConfigurationType -> com.android.tools.r8.AssertionsConfiguration$c:
-    com.android.tools.r8.AssertionsConfiguration$ConfigurationType PACKAGE -> b
-    com.android.tools.r8.AssertionsConfiguration$ConfigurationType ALL -> a
-    com.android.tools.r8.AssertionsConfiguration$ConfigurationType CLASS -> c
-    com.android.tools.r8.AssertionsConfiguration$ConfigurationType[] $VALUES -> d
-    1:3:void <clinit>():28:30 -> <clinit>
-    4:4:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(java.lang.String,int):27:27 -> <init>
-com.android.tools.r8.AssertionsConfiguration$InternalAssertionConfiguration -> com.android.tools.r8.AssertionsConfiguration$d:
-    1:12:void com.android.tools.r8.CompatDxHelper.run(com.android.tools.r8.D8Command,java.lang.Boolean):13:24 -> a
-    13:13:void com.android.tools.r8.CompatDxHelper.ignoreDexInArchive(com.android.tools.r8.BaseCommand$Builder):28:28 -> a
-    14:14:java.util.List getConfiguration(com.android.tools.r8.AssertionsConfiguration):63:63 -> a
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformation transformation -> b
+    com.android.tools.r8.utils.Reporter reporter -> a
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope scope -> c
+    java.lang.String value -> d
+    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.AssertionsConfiguration$1):66:66 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.Reporter):72:73 -> <init>
+    1:13:com.android.tools.r8.AssertionsConfiguration build():147:159 -> build
+    1:1:com.android.tools.r8.AssertionsConfiguration disableAllAssertions(com.android.tools.r8.AssertionsConfiguration$Builder):209:209 -> disableAllAssertions
+    1:1:com.android.tools.r8.AssertionsConfiguration enableAllAssertions(com.android.tools.r8.AssertionsConfiguration$Builder):184:184 -> enableAllAssertions
+    1:1:com.android.tools.r8.AssertionsConfiguration passthroughAllAssertions(com.android.tools.r8.AssertionsConfiguration$Builder):234:234 -> passthroughAllAssertions
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setDisable():97:97 -> setDisable
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setEnable():88:88 -> setEnable
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setPassthrough():103:103 -> setPassthrough
+    1:2:com.android.tools.r8.AssertionsConfiguration$Builder setScopeAll():108:109 -> setScopeAll
+    1:2:com.android.tools.r8.AssertionsConfiguration$Builder setScopeClass(java.lang.String):140:141 -> setScopeClass
+    1:2:com.android.tools.r8.AssertionsConfiguration$Builder setScopePackage(java.lang.String):125:126 -> setScopePackage
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setTransformation(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):79:79 -> setTransformation
 com.android.tools.r8.BaseCommand -> com.android.tools.r8.BaseCommand:
     com.android.tools.r8.utils.AndroidApp app -> c
     boolean printHelp -> a
@@ -222,7 +200,6 @@
     1:1:void <init>(java.nio.file.Path):86:86 -> <init>
 com.android.tools.r8.BaseCompilerCommand -> com.android.tools.r8.BaseCompilerCommand:
     boolean $assertionsDisabled -> o
-    com.android.tools.r8.AssertionsConfiguration assertionsConfiguration -> n
     com.android.tools.r8.utils.Reporter reporter -> i
     boolean enableDesugaring -> j
     int minApiLevel -> h
@@ -231,24 +208,26 @@
     boolean optimizeMultidexForLinearAlloc -> l
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
+    java.util.List assertionsConfiguration -> n
     com.android.tools.r8.CompilationMode mode -> e
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:11:void <init>(boolean,boolean):46:56 -> <init>
-    12:24: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,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.AssertionsConfiguration):71:83 -> <init>
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:11:void <init>(boolean,boolean):45:55 -> <init>
+    12:24: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,boolean,boolean,boolean,java.util.function.BiPredicate,java.util.List):70:82 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:3:com.android.tools.r8.AssertionsConfiguration getAssertionsConfiguration(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):140:142 -> a
-    1:1:com.android.tools.r8.utils.Reporter getReporter():146:146 -> b
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():127:127 -> getDexClassChecksumFilter
-    1:1:boolean getEnableDesugaring():117:117 -> getEnableDesugaring
-    1:1:boolean getIncludeClassesChecksum():122:122 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():112:112 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():96:96 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():91:91 -> getMode
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():105:105 -> getProgramConsumer
-    1:1:boolean isOptimizeMultidexForLinearAlloc():135:135 -> isOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.utils.Reporter getReporter():142:142 -> b
+    1:1:java.util.List getAssertionsConfiguration():138:138 -> getAssertionsConfiguration
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():126:126 -> getDexClassChecksumFilter
+    1:1:boolean getEnableDesugaring():116:116 -> getEnableDesugaring
+    1:1:boolean getIncludeClassesChecksum():121:121 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():111:111 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():95:95 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():90:90 -> getMode
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():104:104 -> getProgramConsumer
+    1:1:boolean isOptimizeMultidexForLinearAlloc():134:134 -> isOptimizeMultidexForLinearAlloc
 com.android.tools.r8.BaseCompilerCommand$Builder -> com.android.tools.r8.BaseCompilerCommand$Builder:
     boolean includeClassesChecksum -> n
     java.util.function.BiPredicate dexClassChecksumFilter -> p
+    java.util.List assertionsConfiguration -> q
     boolean optimizeMultidexForLinearAlloc -> o
     java.nio.file.Path outputPath -> h
     int minApiLevel -> k
@@ -256,64 +235,66 @@
     com.android.tools.r8.OutputMode outputMode -> i
     boolean $assertionsDisabled -> r
     com.android.tools.r8.CompilationMode mode -> j
-    com.android.tools.r8.AssertionsConfiguration assertionsConfiguration -> q
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
     java.util.List desugaredLibraryConfigurationResources -> m
-    1:1:void <clinit>():156:156 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):183:183 -> <init>
-    2:26:void <init>(com.android.tools.r8.DiagnosticsHandler):160:184 -> <init>
-    27:27:void <init>(com.android.tools.r8.utils.AndroidApp):189:189 -> <init>
-    28:58:void <init>(com.android.tools.r8.utils.AndroidApp):160:190 -> <init>
-    59:59:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):195:195 -> <init>
-    60:96:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):160:196 -> <init>
+    1:1:void <clinit>():152:152 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):179:179 -> <init>
+    2:26:void <init>(com.android.tools.r8.DiagnosticsHandler):156:180 -> <init>
+    27:27:void <init>(com.android.tools.r8.utils.AndroidApp):185:185 -> <init>
+    28:58:void <init>(com.android.tools.r8.utils.AndroidApp):156:186 -> <init>
+    59:59:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):191:191 -> <init>
+    60:96:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):156:192 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):362:394 -> a
-    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):464:475 -> a
-    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468:468 -> a
+    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):358:390 -> a
+    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):460:471 -> a
+    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):464:464 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468 -> a
+    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):464 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468 -> a
-    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468:468 -> a
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):497:499 -> addAssertionsConfiguration
-    4:6:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):498:500 -> addAssertionsConfiguration
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):451:452 -> addDesugaredLibraryConfiguration
-    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):451:453 -> addDesugaredLibraryConfiguration
-    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):458:459 -> addDesugaredLibraryConfiguration
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):445:445 -> addSpecialLibraryConfiguration
-    1:29:void validate():509:537 -> e
+    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):464 -> a
+    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):464:464 -> a
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):497:498 -> addAssertionsConfiguration
+    3:3:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):56:56 -> addAssertionsConfiguration
+    3:3:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):498 -> addAssertionsConfiguration
+    4:4:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):498:498 -> addAssertionsConfiguration
+    5:7:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):497:499 -> addAssertionsConfiguration
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):447:448 -> addDesugaredLibraryConfiguration
+    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):447:449 -> addDesugaredLibraryConfiguration
+    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):454:455 -> addDesugaredLibraryConfiguration
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):441:441 -> addSpecialLibraryConfiguration
+    1:29:void validate():504:532 -> e
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> f
-    1:1:boolean hasDesugaredLibraryConfiguration():479:479 -> g
-    1:1:com.android.tools.r8.AssertionsConfiguration getAssertionsConfiguration():504:504 -> getAssertionsConfiguration
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():257:257 -> getDexClassChecksumFilter
-    1:1:boolean getDisableDesugaring():440:440 -> getDisableDesugaring
-    1:1:boolean getIncludeClassesChecksum():490:490 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():250:250 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():399:399 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():203:203 -> getMode
-    1:1:com.android.tools.r8.OutputMode getOutputMode():232:232 -> getOutputMode
-    1:1:java.nio.file.Path getOutputPath():222:222 -> getOutputPath
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():243:243 -> getProgramConsumer
-    1:1:boolean isMinApiLevelSet():403:403 -> h
-    1:1:boolean isOptimizeMultidexForLinearAlloc():275:275 -> i
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):353:355 -> setDexClassChecksumFilter
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):434:435 -> setDisableDesugaring
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):418:419 -> setEnableDesugaring
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):484:485 -> setIncludeClassesChecksum
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):318:319 -> setMainDexListConsumer
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):305:306 -> setMainDexListOutputPath
-    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):409:413 -> setMinApiLevel
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):210:212 -> setMode
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):266:267 -> setOptimizeMultidexForLinearAlloc
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):333:333 -> setOutput
-    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):338:343 -> setOutput
-    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):289:292 -> setProgramConsumer
+    1:1:java.util.List getAssertionsConfiguration():490:490 -> g
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():253:253 -> getDexClassChecksumFilter
+    1:1:boolean getDisableDesugaring():436:436 -> getDisableDesugaring
+    1:1:boolean getIncludeClassesChecksum():486:486 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():246:246 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():395:395 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():199:199 -> getMode
+    1:1:com.android.tools.r8.OutputMode getOutputMode():228:228 -> getOutputMode
+    1:1:java.nio.file.Path getOutputPath():218:218 -> getOutputPath
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():239:239 -> getProgramConsumer
+    1:1:boolean hasDesugaredLibraryConfiguration():475:475 -> h
+    1:1:boolean isMinApiLevelSet():399:399 -> i
+    1:1:boolean isOptimizeMultidexForLinearAlloc():271:271 -> j
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):349:351 -> setDexClassChecksumFilter
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):430:431 -> setDisableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):414:415 -> setEnableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):480:481 -> setIncludeClassesChecksum
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):314:315 -> setMainDexListConsumer
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):301:302 -> setMainDexListOutputPath
+    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):405:409 -> setMinApiLevel
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):206:208 -> setMode
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):262:263 -> setOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):329:329 -> setOutput
+    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):334:339 -> setOutput
+    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):285:288 -> setProgramConsumer
 com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.BaseCompilerCommand$Builder$a:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):369:369 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):365:365 -> <init>
 com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.BaseCompilerCommand$Builder$b:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):376:376 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):372:372 -> <init>
 com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.b:
     1:1:void <init>():14:14 -> <init>
     1:10:void parseMinApi(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):19:28 -> a
@@ -378,6 +359,9 @@
     1:2:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):71:72 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):78:79 -> finished
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():66:66 -> getDataResourceConsumer
+com.android.tools.r8.CompatDxHelper -> com.android.tools.r8.c:
+    1:12:void run(com.android.tools.r8.D8Command,java.lang.Boolean):13:24 -> a
+    13:13:void ignoreDexInArchive(com.android.tools.r8.BaseCommand$Builder):28:28 -> a
 com.android.tools.r8.CompatProguardCommandBuilder -> com.android.tools.r8.CompatProguardCommandBuilder:
     1:1:void <init>():11:11 -> <init>
     2:6:void <init>(boolean,com.android.tools.r8.DiagnosticsHandler):16:20 -> <init>
@@ -431,90 +415,90 @@
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> s
     java.lang.String USAGE_MESSAGE -> u
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> r
-    1:195:void <clinit>():33:227 -> <clinit>
-    1:1: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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):34:34 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):34:34 -> <init>
-    3:19: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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):292:308 -> <init>
-    20:25:void <init>(boolean,boolean):312:317 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):245:245 -> a
-    2:47:com.android.tools.r8.utils.InternalOptions getInternalOptions():322:367 -> a
-    1:1:com.android.tools.r8.D8Command$Builder builder():236:236 -> builder
-    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):240:240 -> builder
-    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):258:258 -> parse
-    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):272:272 -> parse
+    1:195:void <clinit>():35:229 -> <clinit>
+    1:1: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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):36:36 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):36:36 -> <init>
+    3:19: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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,com.android.tools.r8.graph.DexItemFactory):294:310 -> <init>
+    20:25:void <init>(boolean,boolean):314:319 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):247:247 -> a
+    2:48:com.android.tools.r8.utils.InternalOptions getInternalOptions():324:370 -> a
+    1:1:com.android.tools.r8.D8Command$Builder builder():238:238 -> builder
+    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):242:242 -> builder
+    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):260:260 -> parse
+    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):274:274 -> parse
 com.android.tools.r8.D8Command$1 -> com.android.tools.r8.D8Command$a:
 com.android.tools.r8.D8Command$Builder -> com.android.tools.r8.D8Command$Builder:
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> t
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> u
     boolean intermediate -> s
-    1:1:void <init>(com.android.tools.r8.D8Command$1):66:66 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):66:66 -> <init>
-    3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):66:66 -> <init>
-    4:4:void <init>():73:73 -> <init>
-    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):77:77 -> <init>
-    6:8:void <init>(com.android.tools.r8.DiagnosticsHandler):68:70 -> <init>
-    9:9:void <init>(com.android.tools.r8.utils.AndroidApp):81:81 -> <init>
-    10:12:void <init>(com.android.tools.r8.utils.AndroidApp):68:70 -> <init>
-    1:1:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):89:89 -> a
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):65:65 -> addClasspathFiles
-    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):65:65 -> addClasspathFiles
-    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):98:98 -> addClasspathFiles
-    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):106:106 -> addClasspathFiles
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):65:65 -> addClasspathResourceProvider
-    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):114:114 -> addClasspathResourceProvider
-    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):65:65 -> addDexProgramData
-    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):89:89 -> addDexProgramData
-    1:1:com.android.tools.r8.BaseCommand makeCommand():65:65 -> c
-    2:27:com.android.tools.r8.D8Command makeCommand():197:222 -> c
-    28:28:com.android.tools.r8.D8Command makeCommand():198:198 -> c
+    1:1:void <init>(com.android.tools.r8.D8Command$1):68:68 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):68:68 -> <init>
+    3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):68:68 -> <init>
+    4:4:void <init>():75:75 -> <init>
+    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):79:79 -> <init>
+    6:8:void <init>(com.android.tools.r8.DiagnosticsHandler):70:72 -> <init>
+    9:9:void <init>(com.android.tools.r8.utils.AndroidApp):83:83 -> <init>
+    10:12:void <init>(com.android.tools.r8.utils.AndroidApp):70:72 -> <init>
+    1:1:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):91:91 -> a
+    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):67:67 -> addClasspathFiles
+    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):67:67 -> addClasspathFiles
+    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):100:100 -> addClasspathFiles
+    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):108:108 -> addClasspathFiles
+    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):67:67 -> addClasspathResourceProvider
+    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):116:116 -> addClasspathResourceProvider
+    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):67:67 -> addDexProgramData
+    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):91:91 -> addDexProgramData
+    1:1:com.android.tools.r8.BaseCommand makeCommand():67:67 -> c
+    2:27:com.android.tools.r8.D8Command makeCommand():199:224 -> c
+    28:28:com.android.tools.r8.D8Command makeCommand():200:200 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:19:void validate():167:185 -> e
-    20:29:void validate():183:192 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():162:162 -> f
-    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():142:142 -> getDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):151:151 -> setDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):134:134 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):123:123 -> setIntermediate
+    1:19:void validate():169:187 -> e
+    20:29:void validate():185:194 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():164:164 -> f
+    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():144:144 -> getDesugarGraphConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):153:153 -> setDesugarGraphConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):136:136 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):125:125 -> setIntermediate
 com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.D8Command$b:
-    1:1:void <init>():43:43 -> <init>
-    2:2:void <init>(com.android.tools.r8.D8Command$1):43:43 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):47:52 -> error
-    7:13:void error(com.android.tools.r8.Diagnostic):50:56 -> error
-com.android.tools.r8.D8CommandParser -> com.android.tools.r8.c:
+    1:1:void <init>():45:45 -> <init>
+    2:2:void <init>(com.android.tools.r8.D8Command$1):45:45 -> <init>
+    1:6:void error(com.android.tools.r8.Diagnostic):49:54 -> error
+    7:13:void error(com.android.tools.r8.Diagnostic):52:58 -> error
+com.android.tools.r8.D8CommandParser -> com.android.tools.r8.d:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
-    1:96:void <clinit>():26:121 -> <clinit>
-    97:97:void <clinit>():110:110 -> <clinit>
-    98:98:void <clinit>():108:108 -> <clinit>
-    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):143:143 -> a
-    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):157:157 -> a
-    3:43:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):166:206 -> a
-    44:56:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):204:216 -> a
-    57:60:boolean isArchive(java.nio.file.Path):40:43 -> a
-    57:60:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):219 -> a
-    61:64:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):220:223 -> a
-    65:68:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):222:225 -> a
-    69:105:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):217:253 -> a
-    106:106:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():63:63 -> a
-    106:106:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):256 -> a
-    107:118:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):257:268 -> a
-com.android.tools.r8.D8CommandParser$1 -> com.android.tools.r8.c$a:
-com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.c$b:
+    1:97:void <clinit>():26:122 -> <clinit>
+    98:98:void <clinit>():111:111 -> <clinit>
+    99:99:void <clinit>():109:109 -> <clinit>
+    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):146:146 -> a
+    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):160:160 -> a
+    3:43:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):169:209 -> a
+    44:56:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):207:219 -> a
+    57:60:boolean isArchive(java.nio.file.Path):41:44 -> a
+    57:60:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):222 -> a
+    61:64:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):223:226 -> a
+    65:68:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):225:228 -> a
+    69:107:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):220:258 -> a
+    108:108:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():64:64 -> a
+    108:108:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):261 -> a
+    109:120:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):262:273 -> a
+com.android.tools.r8.D8CommandParser$1 -> com.android.tools.r8.d$a:
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.d$b:
     java.util.List providers -> a
     java.util.Set descriptors -> b
-    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.D8CommandParser$1):46:46 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):70:70 -> <init>
-    3:8:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):68:73 -> <init>
-    1:1:void lambda$new$0(com.android.tools.r8.ClassFileResourceProvider):73:73 -> a
-    2:2:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder builder():77:77 -> a
-    1:1:java.util.Set getClassDescriptors():82:82 -> getClassDescriptors
-    1:3:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):89:91 -> getProgramResource
-com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.c$b$a:
+    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.D8CommandParser$1):47:47 -> <init>
+    2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):71:71 -> <init>
+    3:8:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):69:74 -> <init>
+    1:1:void lambda$new$0(com.android.tools.r8.ClassFileResourceProvider):74:74 -> a
+    2:2:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder builder():78:78 -> a
+    1:1:java.util.Set getClassDescriptors():83:83 -> getClassDescriptors
+    1:3:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):90:92 -> getProgramResource
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.d$b$a:
     boolean empty -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder -> a
-    1:4:void <init>():47:50 -> <init>
-    1:1:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider build():53:53 -> a
-    2:3:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder addClassFileResourceProvider(com.android.tools.r8.ClassFileResourceProvider):57:58 -> a
+    1:4:void <init>():48:51 -> <init>
+    1:1:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider build():54:54 -> a
+    2:3:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder addClassFileResourceProvider(com.android.tools.r8.ClassFileResourceProvider):58:59 -> a
 com.android.tools.r8.DataDirectoryResource -> com.android.tools.r8.DataDirectoryResource:
     1:2:com.android.tools.r8.DataDirectoryResource fromFile(java.nio.file.Path,java.nio.file.Path):23:24 -> fromFile
     1:1:com.android.tools.r8.DataDirectoryResource fromName(java.lang.String,com.android.tools.r8.origin.Origin):19:19 -> fromName
@@ -589,7 +573,7 @@
     1:3:java.io.InputStream getByteStream():94:96 -> getByteStream
     1:1:java.lang.String getName():88:88 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():83:83 -> getOrigin
-com.android.tools.r8.DexFileMergerHelper -> com.android.tools.r8.d:
+com.android.tools.r8.DexFileMergerHelper -> com.android.tools.r8.e:
     java.util.Map inputOrdering -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():28:28 -> <clinit>
@@ -763,10 +747,10 @@
     2:2:java.util.Set getClassDescriptors():38:38 -> getClassDescriptors
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):63:68 -> getProgramResource
     1:1:java.nio.file.Path getRoot():73:73 -> getRoot
-com.android.tools.r8.Disassemble -> com.android.tools.r8.e:
+com.android.tools.r8.Disassemble -> com.android.tools.r8.f:
     1:18:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):219:236 -> a
-com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.e$a:
-com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.e$b:
+com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.f$a:
+com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.f$b:
     java.nio.file.Path outputPath -> e
     boolean useIr -> i
     com.android.tools.r8.StringResource proguardMap -> f
@@ -783,7 +767,7 @@
     1:1:com.android.tools.r8.Disassemble$DisassembleCommand$Builder builder():107:107 -> builder
     1:1:boolean useIr():191:191 -> c
     1:1:boolean useSmali():187:187 -> d
-com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.e$b$a:
+com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.f$b$a:
     boolean allInfo -> i
     java.nio.file.Path proguardMapFile -> g
     java.nio.file.Path outputPath -> f
@@ -820,7 +804,7 @@
     int index -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):36:37 -> <init>
     1:1:java.lang.String part():42:42 -> part
-com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.g:
+com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.h:
     java.lang.String USAGE_MESSAGE -> g
     java.util.List programFiles -> f
     boolean csv -> e
@@ -850,8 +834,8 @@
     1:1:boolean getSummary():153:153 -> d
     1:1:boolean getVerbose():149:149 -> e
     1:1:boolean isPrintHelp():137:137 -> f
-com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.f:
-com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.g$a:
+com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.g:
+com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.h$a:
     java.util.List programFiles -> f
     boolean csv -> e
     boolean printHelp -> a
@@ -888,7 +872,7 @@
     1:1:com.android.tools.r8.FeatureSplit$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):87:87 -> addProgramResourceProvider
     1:1:com.android.tools.r8.FeatureSplit build():93:93 -> build
     1:1:com.android.tools.r8.FeatureSplit$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):77:77 -> setProgramConsumer
-com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.h:
+com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.i:
     com.android.tools.r8.utils.InternalOptions options -> c
     java.util.Set parallelMethods -> f
     boolean $assertionsDisabled -> g
@@ -936,7 +920,7 @@
     223:227:void main(java.lang.String[]):375:379 -> a
     1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):239:239 -> b
     1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):253:253 -> c
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.h$a:
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.i$a:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
     1:3:void <init>(java.util.Set,java.util.Map):190:192 -> <init>
@@ -1007,7 +991,7 @@
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):132:132 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):100:100 -> setMainDexListConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListOutputPath(java.nio.file.Path):94:94 -> setMainDexListOutputPath
-com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.i:
+com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.j:
 com.android.tools.r8.JdkClassFileProvider -> com.android.tools.r8.JdkClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Map descriptorToModule -> c
@@ -1040,83 +1024,114 @@
     32:32:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):157:157 -> getProgramResource
 com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>():33:33 -> <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):73:74 -> a
-    3:3: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):86:86 -> a
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:1:void <init>():36:36 -> <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):76:77 -> a
+    3:3: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):89:89 -> a
     4:4:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> a
-    4:4: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):86 -> a
-    5:10: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):92:97 -> a
-    11:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):103:133 -> a
-    11:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):89 -> a
+    4:4: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):89 -> a
+    5:10: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):95:100 -> a
+    11:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:136 -> a
+    11:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):92 -> a
     42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():349:349 -> a
-    42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135 -> a
-    42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):89 -> a
-    43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135:143 -> a
-    43:51:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):89 -> a
-    52:57:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138:143 -> a
-    52:57:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):89 -> a
-    1:5:void run(com.android.tools.r8.L8Command):42:46 -> run
-    6:6:void run(com.android.tools.r8.L8Command):41:41 -> run
-    7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):58:62 -> run
-    12:12:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):57:57 -> run
+    42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138 -> a
+    42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):92 -> a
+    43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138:146 -> a
+    43:51:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):92 -> a
+    52:57:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:146 -> a
+    52:57:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):92 -> a
+    58:59:void run(java.lang.String[]):152:153 -> a
+    58:59:void lambda$main$1(java.lang.String[]):175 -> a
+    60:60:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
+    60:60:void run(java.lang.String[]):154 -> a
+    60:60:void lambda$main$1(java.lang.String[]):175 -> a
+    61:61:void run(java.lang.String[]):155:155 -> a
+    61:61:void lambda$main$1(java.lang.String[]):175 -> a
+    62:62:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
+    62:62:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
+    62:62:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
+    62:62:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
+    62:62:void run(java.lang.String[]):154 -> a
+    62:62:void lambda$main$1(java.lang.String[]):175 -> a
+    63:67:void run(java.lang.String[]):158:162 -> a
+    63:67:void lambda$main$1(java.lang.String[]):175 -> a
+    1:5:void main(java.lang.String[]):171:175 -> main
+    1:5:void run(com.android.tools.r8.L8Command):45:49 -> run
+    6:6:void run(com.android.tools.r8.L8Command):44:44 -> run
+    7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):61:65 -> run
+    12:12:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):60:60 -> run
 com.android.tools.r8.L8Command -> com.android.tools.r8.L8Command:
     com.android.tools.r8.graph.DexItemFactory factory -> s
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> r
+    boolean $assertionsDisabled -> u
     com.android.tools.r8.D8Command d8Command -> p
-    boolean $assertionsDisabled -> t
+    java.lang.String USAGE_MESSAGE -> t
     com.android.tools.r8.R8Command r8Command -> q
-    1:1:void <clinit>():24:24 -> <clinit>
-    1:1: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,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.L8Command$1):25:25 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):25:25 -> <init>
-    3:14: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,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):55:66 -> <init>
-    15:30: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,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):55:70 -> <init>
-    31:35:void <init>(boolean,boolean):74:78 -> <init>
+    1:4:void <clinit>():26:29 -> <clinit>
+    1:1: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,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.L8Command$1):27:27 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):27:27 -> <init>
+    3:14: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,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):86:97 -> <init>
+    15:30: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,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):86:101 -> <init>
+    31:35:void <init>(boolean,boolean):105:109 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:42:com.android.tools.r8.utils.InternalOptions getInternalOptions():107:148 -> a
-    1:1:com.android.tools.r8.L8Command$Builder builder():98:98 -> builder
-    2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):102:102 -> builder
-    1:1:com.android.tools.r8.D8Command getD8Command():37:37 -> c
-    1:1:com.android.tools.r8.R8Command getR8Command():41:41 -> d
-    1:1:boolean isShrinking():33:33 -> e
+    1:43:com.android.tools.r8.utils.InternalOptions getInternalOptions():138:180 -> a
+    1:1:com.android.tools.r8.L8Command$Builder builder():129:129 -> builder
+    2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):133:133 -> builder
+    1:1:com.android.tools.r8.D8Command getD8Command():41:41 -> c
+    1:1:com.android.tools.r8.R8Command getR8Command():45:45 -> d
+    1:1:boolean isShrinking():37:37 -> e
+    1:1:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):58:58 -> parse
+    2:2:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):72:72 -> parse
 com.android.tools.r8.L8Command$1 -> com.android.tools.r8.L8Command$a:
 com.android.tools.r8.L8Command$Builder -> com.android.tools.r8.L8Command$Builder:
     java.util.List proguardConfigFiles -> t
     java.util.List proguardConfigStrings -> s
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):159:159 -> <init>
-    2:2:void <init>(com.android.tools.r8.L8Command$1):159:159 -> <init>
-    3:3:void <init>():165:165 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):169:169 -> <init>
-    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):161:162 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):201:201 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):189:189 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):195:195 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():227:231 -> c
-    1:5:com.android.tools.r8.BaseCommand makeCommand():158 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():232 -> c
-    6:6:com.android.tools.r8.BaseCommand makeCommand():158 -> c
-    7:35:com.android.tools.r8.L8Command makeCommand():232:260 -> c
-    7:35:com.android.tools.r8.BaseCommand makeCommand():158 -> c
-    36:61:com.android.tools.r8.L8Command makeCommand():259:284 -> c
-    36:61:com.android.tools.r8.BaseCommand makeCommand():158 -> c
-    62:62:com.android.tools.r8.L8Command makeCommand():228:228 -> c
-    62:62:com.android.tools.r8.BaseCommand makeCommand():158 -> c
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):191:191 -> <init>
+    2:2:void <init>(com.android.tools.r8.L8Command$1):191:191 -> <init>
+    3:3:void <init>():197:197 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):201:201 -> <init>
+    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):193:194 -> <init>
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):233:233 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):221:221 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):227:227 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():259:263 -> c
+    1:5:com.android.tools.r8.BaseCommand makeCommand():190 -> c
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():216:216 -> c
+    6:6:com.android.tools.r8.L8Command makeCommand():264 -> c
+    6:6:com.android.tools.r8.BaseCommand makeCommand():190 -> c
+    7:35:com.android.tools.r8.L8Command makeCommand():264:292 -> c
+    7:35:com.android.tools.r8.BaseCommand makeCommand():190 -> c
+    36:61:com.android.tools.r8.L8Command makeCommand():291:316 -> c
+    36:61:com.android.tools.r8.BaseCommand makeCommand():190 -> c
+    62:62:com.android.tools.r8.L8Command makeCommand():260:260 -> c
+    62:62:com.android.tools.r8.BaseCommand makeCommand():190 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:16:void validate():207:222 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> f
-    1:1:boolean isShrinking():174:174 -> isShrinking
+    1:16:void validate():239:254 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():216:216 -> f
+    1:1:boolean isShrinking():206:206 -> isShrinking
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
-    1:1:void <init>():81:81 -> <init>
-    1:5:void error(com.android.tools.r8.Diagnostic):85:89 -> error
-    6:12:void error(com.android.tools.r8.Diagnostic):87:93 -> error
+    1:1:void <init>():112:112 -> <init>
+    1:5:void error(com.android.tools.r8.Diagnostic):116:120 -> error
+    6:12:void error(com.android.tools.r8.Diagnostic):118:124 -> error
 com.android.tools.r8.L8Command$DesugaredLibrary -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():290:292 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):298:300 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):299:299 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):298:298 -> accept
-    1:1:java.util.Collection getProgramResources():305:305 -> getProgramResources
+    1:3:void <init>():322:324 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):330:332 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):331:331 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):330:330 -> accept
+    1:1:java.util.Collection getProgramResources():337:337 -> getProgramResources
+com.android.tools.r8.L8CommandParser -> com.android.tools.r8.k:
+    java.util.Set OPTIONS_WITH_PARAMETER -> a
+    1:25:void <clinit>():21:45 -> <clinit>
+    26:26:void <clinit>():35:35 -> <clinit>
+    27:27:void <clinit>():33:33 -> <clinit>
+    1:1:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):63:63 -> a
+    2:2:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):77:77 -> a
+    3:41:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):86:124 -> a
+    42:67:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):122:147 -> a
+    68:68:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():64:64 -> a
+    68:68:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):150 -> a
+    69:80:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):151:162 -> a
 com.android.tools.r8.OutputMode -> com.android.tools.r8.OutputMode:
     com.android.tools.r8.OutputMode[] $VALUES -> a
     1:16:void <clinit>():11:26 -> <clinit>
@@ -1284,34 +1299,30 @@
     boolean $assertionsDisabled -> G
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> D
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> C
-    1:575:void <clinit>():56:630 -> <clinit>
-    1:1: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,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.R8Command$1):57:57 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):57:57 -> <init>
-    3:32: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,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.AssertionsConfiguration):724:753 -> <init>
-    33:49:void <init>(boolean,boolean):757:773 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):661:661 -> a
-    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):666:666 -> a
-    3:55:com.android.tools.r8.utils.InternalOptions getInternalOptions():788:840 -> a
-    56:66:com.android.tools.r8.utils.InternalOptions getInternalOptions():837:847 -> a
-    67:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():844:854 -> a
-    78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():851:861 -> a
-    89:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():858:873 -> a
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():878 -> a
-    106:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():879:880 -> a
-    108:108:com.android.tools.r8.utils.InternalOptions getInternalOptions():877:877 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    109:109:com.android.tools.r8.utils.InternalOptions getInternalOptions():885 -> a
-    110:124:com.android.tools.r8.utils.InternalOptions getInternalOptions():886:900 -> a
-    125:127:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):909:911 -> a
-    1:1:com.android.tools.r8.R8Command$Builder builder():651:651 -> builder
-    2:2:void com.android.tools.r8.R8Command$Builder.<init>():109:109 -> builder
-    2:2:com.android.tools.r8.R8Command$Builder builder():651 -> builder
-    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):656:656 -> builder
-    1:1:boolean getEnableMinification():783:783 -> getEnableMinification
-    1:1:boolean getEnableTreeShaking():778:778 -> getEnableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):679:679 -> parse
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):693:693 -> parse
+    1:575:void <clinit>():57:631 -> <clinit>
+    1:1: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,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,com.android.tools.r8.R8Command$1):58:58 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):58:58 -> <init>
+    3:32: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,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List):725:754 -> <init>
+    33:49:void <init>(boolean,boolean):758:774 -> <init>
+    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):662:662 -> a
+    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):667:667 -> a
+    3:55:com.android.tools.r8.utils.InternalOptions getInternalOptions():789:841 -> a
+    56:66:com.android.tools.r8.utils.InternalOptions getInternalOptions():838:848 -> a
+    67:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():845:855 -> a
+    78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():852:862 -> a
+    89:111:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:881 -> a
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    112:112:com.android.tools.r8.utils.InternalOptions getInternalOptions():886 -> a
+    113:127:com.android.tools.r8.utils.InternalOptions getInternalOptions():887:901 -> a
+    128:130:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):910:912 -> a
+    1:1:com.android.tools.r8.R8Command$Builder builder():652:652 -> builder
+    2:2:void com.android.tools.r8.R8Command$Builder.<init>():110:110 -> builder
+    2:2:com.android.tools.r8.R8Command$Builder builder():652 -> builder
+    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):657:657 -> builder
+    1:1:boolean getEnableMinification():784:784 -> getEnableMinification
+    1:1:boolean getEnableTreeShaking():779:779 -> getEnableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):680:680 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):694:694 -> parse
 com.android.tools.r8.R8Command$1 -> com.android.tools.r8.R8Command$a:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
     com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> F
@@ -1332,120 +1343,120 @@
     com.android.tools.r8.StringConsumer proguardUsageConsumer -> C
     com.android.tools.r8.StringConsumer proguardSeedsConsumer -> D
     com.android.tools.r8.StringConsumer proguardMapConsumer -> B
-    1:1:void <clinit>():64:64 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):65:65 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):65:65 -> <init>
-    3:3:void <init>():109:109 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):113:113 -> <init>
-    5:25:void <init>(com.android.tools.r8.DiagnosticsHandler):85:105 -> <init>
-    26:26:void <init>(com.android.tools.r8.utils.AndroidApp):117:117 -> <init>
-    27:47:void <init>(com.android.tools.r8.utils.AndroidApp):85:105 -> <init>
-    48:48:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):121:121 -> <init>
-    49:69:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):85:105 -> <init>
-    1:1:java.lang.Boolean lambda$new$0(java.lang.String,java.lang.Long):100:100 -> a
-    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):169:170 -> a
-    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):179:180 -> a
-    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:189 -> a
-    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> a
-    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):206:207 -> a
-    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):392:392 -> a
-    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):511:513 -> a
-    15:16:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):573:574 -> a
-    17:19:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):577:579 -> a
-    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:366 -> addFeatureSplit
+    1:1:void <clinit>():65:65 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):66:66 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):66:66 -> <init>
+    3:3:void <init>():110:110 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):114:114 -> <init>
+    5:25:void <init>(com.android.tools.r8.DiagnosticsHandler):86:106 -> <init>
+    26:26:void <init>(com.android.tools.r8.utils.AndroidApp):118:118 -> <init>
+    27:47:void <init>(com.android.tools.r8.utils.AndroidApp):86:106 -> <init>
+    48:48:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):122:122 -> <init>
+    49:69:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):86:106 -> <init>
+    1:1:java.lang.Boolean lambda$new$0(java.lang.String,java.lang.Long):101:101 -> a
+    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):170:171 -> a
+    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):180:181 -> a
+    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):189:190 -> a
+    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):189:189 -> a
+    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):207:208 -> a
+    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):393:393 -> a
+    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):512:514 -> a
+    15:16:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):574:575 -> a
+    17:19:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):578:580 -> a
+    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):367:367 -> addFeatureSplit
     2:2:com.android.tools.r8.FeatureSplit$Builder com.android.tools.r8.FeatureSplit.builder(com.android.tools.r8.DiagnosticsHandler):50:50 -> addFeatureSplit
-    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366 -> addFeatureSplit
-    3:6:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:369 -> addFeatureSplit
-    7:21:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):368:382 -> addFeatureSplit
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> addMainDexRules
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):168:168 -> addMainDexRulesFiles
-    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):178:178 -> addMainDexRulesFiles
-    1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):64:64 -> addProgramResourceProvider
-    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):353:353 -> addProgramResourceProvider
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> addProguardConfiguration
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):195:195 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):205:205 -> addProguardConfigurationFiles
-    1:1:void setDisableVerticalClassMerging(boolean):131:131 -> b
-    2:3:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):196:197 -> b
-    4:5:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:216 -> b
-    6:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> b
-    7:9:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):586:588 -> b
-    1:1:com.android.tools.r8.BaseCommand makeCommand():64:64 -> c
-    2:5:com.android.tools.r8.R8Command makeCommand():443:446 -> c
-    6:6:com.android.tools.r8.R8Command makeCommand():444:444 -> c
+    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):367 -> addFeatureSplit
+    3:6:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):367:370 -> addFeatureSplit
+    7:21:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):369:383 -> addFeatureSplit
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):189:189 -> addMainDexRules
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):169:169 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):179:179 -> addMainDexRulesFiles
+    1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):65:65 -> addProgramResourceProvider
+    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):354:354 -> addProgramResourceProvider
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):216:216 -> addProguardConfiguration
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):196:196 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):206:206 -> addProguardConfigurationFiles
+    1:1:void setDisableVerticalClassMerging(boolean):132:132 -> b
+    2:3:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):197:198 -> b
+    4:5:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):216:217 -> b
+    6:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):216:216 -> b
+    7:9:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):587:589 -> b
+    1:1:com.android.tools.r8.BaseCommand makeCommand():65:65 -> c
+    2:5:com.android.tools.r8.R8Command makeCommand():444:447 -> c
+    6:6:com.android.tools.r8.R8Command makeCommand():445:445 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:18:void validate():397:414 -> e
-    19:44:void validate():412:437 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():141:141 -> f
-    void allowPartiallyImplementedProguardOptions() -> j
-    1:1:void allowTestProguardOptions():599:599 -> k
-    1:1:void internalForceProguardCompatibility():127:127 -> l
-    1:117:com.android.tools.r8.R8Command makeR8Command():450:566 -> m
-    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):255:255 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):162:162 -> setDisableMinification
-    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):151:151 -> setDisableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):298:298 -> setKeptGraphConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):306:306 -> setMainDexKeptGraphConsumer
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):64:64 -> setOutput
-    2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):64:64 -> setOutput
-    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):325:325 -> setOutput
-    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:348 -> setOutput
-    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):290:290 -> setProguardConfigurationConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):244:244 -> setProguardMapConsumer
-    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):230:231 -> setProguardMapOutputPath
-    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):279:279 -> setProguardSeedsConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):267:267 -> setProguardUsageConsumer
+    1:18:void validate():398:415 -> e
+    19:44:void validate():413:438 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():142:142 -> f
+    void allowPartiallyImplementedProguardOptions() -> k
+    1:1:void allowTestProguardOptions():600:600 -> l
+    1:1:void internalForceProguardCompatibility():128:128 -> m
+    1:117:com.android.tools.r8.R8Command makeR8Command():451:567 -> n
+    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):256:256 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):163:163 -> setDisableMinification
+    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):152:152 -> setDisableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):299:299 -> setKeptGraphConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):307:307 -> setMainDexKeptGraphConsumer
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):65:65 -> setOutput
+    2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):65:65 -> setOutput
+    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):326:326 -> setOutput
+    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):349:349 -> setOutput
+    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):291:291 -> setProguardConfigurationConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):245:245 -> setProguardMapConsumer
+    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):231:232 -> setProguardMapOutputPath
+    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):280:280 -> setProguardSeedsConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):268:268 -> setProguardUsageConsumer
 com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.R8Command$Builder$a:
     com.android.tools.r8.ProgramResourceProvider val$programResourceProvider -> a
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.ProgramResourceProvider):371:371 -> <init>
-    1:1:java.util.Collection getProgramResources():374:374 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.ProgramResourceProvider):372:372 -> <init>
+    1:1:java.util.Collection getProgramResources():375:375 -> getProgramResources
 com.android.tools.r8.R8Command$Builder$2 -> com.android.tools.r8.R8Command$Builder$b:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):482:482 -> <init>
-    1:6:void visit(com.android.tools.r8.DataEntryResource):490:495 -> visit
-    7:15:void visit(com.android.tools.r8.DataEntryResource):491:499 -> visit
-    16:17:void visit(com.android.tools.r8.DataEntryResource):496:497 -> visit
-    18:18:void visit(com.android.tools.r8.DataEntryResource):496:496 -> visit
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):483:483 -> <init>
+    1:6:void visit(com.android.tools.r8.DataEntryResource):491:496 -> visit
+    7:15:void visit(com.android.tools.r8.DataEntryResource):492:500 -> visit
+    16:17:void visit(com.android.tools.r8.DataEntryResource):497:498 -> visit
+    18:18:void visit(com.android.tools.r8.DataEntryResource):497:497 -> visit
 com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.R8Command$Builder$c:
-    1:1:void <init>():67:67 -> <init>
-    2:2:void <init>(com.android.tools.r8.R8Command$1):67:67 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):71:76 -> error
-    7:14:void error(com.android.tools.r8.Diagnostic):74:81 -> error
+    1:1:void <init>():68:68 -> <init>
+    2:2:void <init>(com.android.tools.r8.R8Command$1):68:68 -> <init>
+    1:6:void error(com.android.tools.r8.Diagnostic):72:77 -> error
+    7:14:void error(com.android.tools.r8.Diagnostic):75:82 -> error
 com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.R8Command$b:
     com.android.tools.r8.ProgramResourceProvider provider -> a
-    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):608:609 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():626:626 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():614:617 -> getProgramResources
+    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):609:610 -> <init>
+    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():627:627 -> getDataResourceProvider
+    1:4:java.util.Collection getProgramResources():615:618 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):920:920 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):925:926 -> accept
-com.android.tools.r8.R8CommandParser -> com.android.tools.r8.l:
+    1:1:void <init>(com.android.tools.r8.StringConsumer):921:921 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):926:927 -> accept
+com.android.tools.r8.R8CommandParser -> com.android.tools.r8.n:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
-    1:47:void <clinit>():18:64 -> <clinit>
-    48:48:void <clinit>():51:51 -> <clinit>
-    49:49:void <clinit>() -> <clinit>
+    1:48:void <clinit>():18:65 -> <clinit>
+    49:49:void <clinit>():52:52 -> <clinit>
+    50:50:void <clinit>() -> <clinit>
     1:1:void <init>():16:16 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):89:89 -> a
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):103:103 -> a
-    3:3:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):107:107 -> a
-    4:57:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):120:173 -> a
-    4:57:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):108 -> a
-    58:103:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):170:215 -> a
-    58:103:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):108 -> a
-    104:109:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):109:114 -> a
-com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.j:
-com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.k:
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):92:92 -> a
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):106:106 -> a
+    3:3:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):110:110 -> a
+    4:57:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):123:176 -> a
+    4:57:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):111 -> a
+    58:105:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):173:220 -> a
+    58:105:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):111 -> a
+    106:111:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):112:117 -> a
+com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.l:
+com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.m:
     java.nio.file.Path outputPath -> c
     com.android.tools.r8.OutputMode outputMode -> b
     boolean includeDataResources -> e
     com.android.tools.r8.CompilationMode mode -> a
     boolean hasDefinedApiLevel -> d
-    1:6:void <init>():40:45 -> <init>
-    7:7:void <init>(com.android.tools.r8.R8CommandParser$1):40:40 -> <init>
-    1:1:boolean access$100(com.android.tools.r8.R8CommandParser$ParseState):40:40 -> a
-    2:2:boolean access$102(com.android.tools.r8.R8CommandParser$ParseState,boolean):40:40 -> a
+    1:6:void <init>():41:46 -> <init>
+    7:7:void <init>(com.android.tools.r8.R8CommandParser$1):41:41 -> <init>
+    1:1:boolean access$100(com.android.tools.r8.R8CommandParser$ParseState):41:41 -> a
+    2:2:boolean access$102(com.android.tools.r8.R8CommandParser$ParseState,boolean):41:41 -> a
 com.android.tools.r8.ResourceException -> com.android.tools.r8.ResourceException:
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):20:21 -> <init>
@@ -1622,14 +1633,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):189:191 -> <init>
     1:6:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:201 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):207:211 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.m:
+com.android.tools.r8.StringResource -> com.android.tools.r8.o:
     java.lang.String getString() -> a
     1:1:com.android.tools.r8.StringResource fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> a
     2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
     3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
     3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37 -> a
-com.android.tools.r8.StringResource$1 -> com.android.tools.r8.m$a:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.m$b:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.o$a:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.o$b:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -1639,7 +1650,7 @@
     2:7:void <init>(java.nio.file.Path,java.nio.charset.Charset):87:92 -> <init>
     1:3:java.lang.String getString():103:105 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():97:97 -> getOrigin
-com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.m$c:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.o$c:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -1660,20 +1671,20 @@
     1:1:java.lang.String getPreReleaseString():86:86 -> getPreReleaseString
     1:1:java.lang.String getVersionString():21:21 -> getVersionString
     1:1:boolean isDevelopmentVersion():106:106 -> isDevelopmentVersion
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.n.a:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.p.a:
     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):76:79 -> a
     5:17:void writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):183:195 -> a
     5:17: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):82 -> a
     18:25: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):83:90 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.n.a$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.p.a$a:
     com.android.tools.r8.bisect.BisectOptions$Result apply(com.android.tools.r8.graph.DexApplication) -> a
-com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.n.b:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.p.b:
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> a
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> b
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> c
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
-com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.n.c:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.p.c:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -1752,7 +1763,7 @@
     8:10:void write():316 -> d
     11:16:void write():317:322 -> d
     17:27:void write():312:322 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.n.c$a:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.p.c$a:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -1766,14 +1777,14 @@
     1:5:boolean equals(java.lang.Object):100:104 -> equals
     1:1:int hashCode():109:109 -> hashCode
     1:1:java.lang.String toString():95:95 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.n.c$b:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.p.c$b:
     boolean good -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.bisect.BisectState$Range range -> b
     1:1:void <clinit>():117:117 -> <clinit>
     1:4:void <init>(com.android.tools.r8.bisect.BisectOptions$Result,com.android.tools.r8.bisect.BisectState$Range):121:124 -> <init>
     5:9:void <init>(java.lang.String):127:131 -> <init>
-com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.o.a:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.q.a:
     boolean pendingComma -> o
     java.util.Set imports -> j
     java.lang.StringBuilder builder -> p
@@ -1891,7 +1902,7 @@
     7:7:java.lang.String memberType(com.android.tools.r8.ir.code.MemberType):216:216 -> b
     1:1:boolean lambda$type$0(java.lang.String):176:176 -> c
     2:2:java.lang.String immutableListType():182:182 -> c
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.o.b:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.q.b:
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
     boolean $assertionsDisabled -> i
@@ -2033,7 +2044,7 @@
     17:18:void instructionIndex():668:669 -> b
     1:2:void newline():662:663 -> c
     1:1:java.lang.String toString():743:743 -> toString
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.o.d:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.q.d:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -2128,12 +2139,12 @@
     87:96:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):368:377 -> b
     97:108:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):383:394 -> b
     1:1:int registersUsed():123:123 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.o.c:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.q.c:
     java.util.List stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap registers -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List):71:73 -> <init>
     1:11:java.lang.String toString():78:88 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.o.e:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.q.e:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> L
@@ -2143,7 +2154,7 @@
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> i0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.o.g:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.q.g:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -2220,11 +2231,11 @@
     87:89:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator):292:294 -> b
     87:89:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):206 -> b
     90:92:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):207:209 -> b
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.o.f:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.q.f:
     com.android.tools.r8.ir.code.Phi phi -> a
     com.android.tools.r8.ir.code.Value operand -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):236:238 -> <init>
-com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.o.m:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.q.m:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -2239,14 +2250,14 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):115:115 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:123 -> <init>
     1:8:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):127:134 -> a
-    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():217:217 -> a
+    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():224:224 -> a
     9:9:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):136 -> a
     10:12:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):137:139 -> a
-    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():201:201 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():208:208 -> a
     13:13:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():205:205 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():212:212 -> a
     14:14:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):141 -> a
-    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():209:209 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():216:216 -> a
     15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):142 -> a
     16:16:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143:143 -> a
     17:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):139:144 -> a
@@ -2277,8 +2288,8 @@
     22:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     23:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     24:24:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):163:163 -> b
-com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.o.h:
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.o.i:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.q.h:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.q.i:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2286,7 +2297,7 @@
     2:4:void <init>(com.android.tools.r8.graph.DexType):44:46 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():51:51 -> a
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.o.j:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.q.j:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2296,7 +2307,7 @@
     2:2:com.android.tools.r8.graph.DexType getDexType():70:70 -> toString
     2:2:java.lang.String toString():75 -> toString
     3:3:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.o.k:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.q.k:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -2307,9 +2318,9 @@
     2:2:com.android.tools.r8.graph.DexType getDexType():92:92 -> toString
     2:2:java.lang.String toString():97 -> toString
     3:3:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.o.l:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.q.l:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.o.n.a:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.q.n.a:
     com.android.tools.r8.ir.code.NumericType type -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> a
     boolean $assertionsDisabled -> c
@@ -2356,7 +2367,7 @@
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():43:43 -> r
     1:1:com.android.tools.r8.ir.code.NumericType getType():47:47 -> s
     1:1:int getAsmOpcodeTypeOffset():115:115 -> t
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.o.n.a$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.q.n.a$a:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> f
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> a
@@ -2366,7 +2377,7 @@
     1:5:void <clinit>():25:29 -> <clinit>
     6:6:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.o.n.b:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.q.n.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -2377,7 +2388,7 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():67:67 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):51 -> a
     boolean canThrow() -> e
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.o.n.c:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.q.n.c:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.code.MemberType type -> a
     1:1:void <clinit>():23:23 -> <clinit>
@@ -2404,7 +2415,7 @@
     60:66:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:87 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.ir.code.MemberType getType():33:33 -> q
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.o.n.d:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.q.n.d:
     com.android.tools.r8.ir.code.MemberType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):26:27 -> <init>
     1:19:int getStoreType():35:53 -> a
@@ -2416,7 +2427,7 @@
     23:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):74:77 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.ir.code.MemberType getType():31:31 -> q
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.o.n.e:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.q.n.e:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2426,7 +2437,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):67:67 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexType getType():30:30 -> q
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.o.n.f:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.q.n.f:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -2448,7 +2459,7 @@
     11:11:int getAsmOpcode():69:69 -> q
     1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():40:40 -> r
     1:1:com.android.tools.r8.ir.code.NumericType getType():44:44 -> s
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.o.n.g:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.q.n.g:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):25:26 -> <init>
     1:1:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
@@ -2462,7 +2473,7 @@
     28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):90:90 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexType getType():30:30 -> q
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.o.n.h:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.q.n.h:
     com.android.tools.r8.graph.DexMethodHandle handle -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2474,7 +2485,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> q
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.o.n.i:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.q.n.i:
     com.android.tools.r8.graph.DexProto type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProto):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2486,14 +2497,14 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> q
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.o.n.j:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.q.n.j:
     1:1:void <init>():20:20 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):24:24 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):29:29 -> a
     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):34:34 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():92:92 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):43 -> a
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.o.n.k:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.q.n.k:
     com.android.tools.r8.ir.code.ValueType type -> b
     long value -> a
     boolean $assertionsDisabled -> c
@@ -2535,7 +2546,7 @@
     1:2:long getLongValue():45:46 -> t
     1:1:long getRawValue():36:36 -> u
     1:1:com.android.tools.r8.ir.code.ValueType getType():32:32 -> v
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.o.n.l:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.q.n.l:
     com.android.tools.r8.graph.DexString string -> a
     1:2:void <init>(com.android.tools.r8.graph.DexString):23:24 -> <init>
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
@@ -2549,7 +2560,7 @@
     boolean canThrow() -> e
     boolean isConstString() -> i
     1:1:com.android.tools.r8.graph.DexString getString():28:28 -> q
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.o.n.m:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.q.n.m:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> b
     com.android.tools.r8.graph.DexReference item -> a
     boolean $assertionsDisabled -> c
@@ -2567,7 +2578,7 @@
     boolean isDexItemBasedConstString() -> j
     1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> q
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():37:37 -> r
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.o.n.n:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.q.n.n:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.graph.DexField declaringField -> c
     boolean $assertionsDisabled -> d
@@ -2594,7 +2605,7 @@
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexField getField():37:37 -> q
     1:1:int getOpcode():41:41 -> r
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.o.n.p:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.q.n.p:
     java.util.List stack -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> a
@@ -2616,8 +2627,8 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():208:208 -> q
     1:1:java.util.List getStack():212:212 -> r
     1:1:java.lang.String toString():276:276 -> toString
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.o.n.o:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.o.n.p$a:
+com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.q.n.o:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.q.n.p$a:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):28:28 -> <init>
     2:2:void <init>():76:76 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -2632,7 +2643,7 @@
     boolean isWide() -> g
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():43:43 -> h
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():39:39 -> i
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.o.n.q:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.q.n.q:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():79:79 -> <clinit>
@@ -2645,26 +2656,26 @@
     boolean isInitialized() -> c
     1:1:boolean isWide():116:116 -> g
     1:1:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.o.n.r:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.q.n.r:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
     1:1:void <clinit>():132:132 -> <clinit>
     1:1:void <init>():130:130 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):141:141 -> a
     boolean isTop() -> d
     1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():130:130 -> j
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.o.n.s:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.q.n.s:
     com.android.tools.r8.cf.code.CfLabel label -> a
     1:1:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfFrame$1):150:150 -> <init>
     2:3:void <init>(com.android.tools.r8.cf.code.CfLabel):153:154 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):164:164 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():174:174 -> b
     boolean isUninitializedNew() -> e
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.o.n.t:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.q.n.t:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):178:178 -> <init>
     2:2:void <init>():179:179 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):183:183 -> a
     boolean isUninitializedThis() -> f
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.o.n.u:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.q.n.u:
     com.android.tools.r8.cf.code.CfLabel target -> a
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):23:24 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):49:49 -> a
@@ -2674,7 +2685,7 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):68 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():44:44 -> g
     boolean isJump() -> l
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.o.n.v:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.q.n.v:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -2692,7 +2703,7 @@
     16:16:int getOpcode():61:61 -> r
     17:17:int getOpcode():51:51 -> r
     1:1:com.android.tools.r8.ir.code.ValueType getType():36:36 -> s
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.o.n.w:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.q.n.w:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -2717,7 +2728,7 @@
     boolean isJump() -> l
     1:1:com.android.tools.r8.ir.code.If$Type getKind():36:36 -> q
     1:1:com.android.tools.r8.ir.code.ValueType getType():40:40 -> r
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.o.n.x:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.q.n.x:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):24:26 -> <init>
@@ -2727,7 +2738,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):59:59 -> a
     1:1:int getIncrement():44:44 -> q
     1:1:int getLocalIndex():40:40 -> r
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.o.n.y:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.q.n.y:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):24:25 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):34:34 -> a
@@ -2738,7 +2749,7 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):65:65 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> q
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.o.n.z:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.q.n.z:
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
@@ -2762,7 +2773,7 @@
     boolean isReturn() -> o
     boolean isStore() -> p
     1:3:java.lang.String toString():27:29 -> toString
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.o.n.A:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.q.n.A:
     int opcode -> b
     com.android.tools.r8.graph.DexMethod method -> a
     boolean itf -> c
@@ -2802,7 +2813,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getMethod():50:50 -> q
     1:1:int getOpcode():54:54 -> r
     1:1:boolean isInterface():58:58 -> s
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.o.n.B:
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.q.n.B:
     com.android.tools.r8.graph.DexCallSite callSite -> a
     1:2:void <init>(com.android.tools.r8.graph.DexCallSite):41:42 -> <init>
     1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:51 -> a
@@ -2825,7 +2836,7 @@
     49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):124 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():88:88 -> q
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.o.n.C:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.q.n.C:
     com.android.tools.r8.org.objectweb.asm.Label label -> a
     1:3:void <init>():19:21 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
@@ -2835,7 +2846,7 @@
     boolean emitsIR() -> f
     boolean isLabel() -> m
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():24:27 -> q
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.o.n.D:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.q.n.D:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):27:29 -> <init>
@@ -2852,7 +2863,7 @@
     boolean isLoad() -> n
     1:1:int getLocalIndex():74:74 -> q
     1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> r
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.o.n.E:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.q.n.E:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -2891,7 +2902,7 @@
     21:21:int getAsmOpcode():86:86 -> q
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():49:49 -> r
     1:1:com.android.tools.r8.ir.code.NumericType getType():45:45 -> s
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.o.n.E$a:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.q.n.E$a:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> d
@@ -2902,7 +2913,7 @@
     1:6:void <clinit>():25:30 -> <clinit>
     7:7:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.o.n.F:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.q.n.F:
     com.android.tools.r8.ir.code.Monitor$Type type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2912,7 +2923,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):60 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():30:30 -> q
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.o.n.G:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.q.n.G:
     com.android.tools.r8.graph.DexType type -> a
     int dimensions -> b
     boolean $assertionsDisabled -> c
@@ -2931,7 +2942,7 @@
     boolean canThrow() -> e
     1:1:int getDimensions():35:35 -> q
     1:1:com.android.tools.r8.graph.DexType getType():31:31 -> r
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.o.n.H:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.q.n.H:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):26:27 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):36:36 -> a
@@ -2941,7 +2952,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):89 -> a
     1:14:int getAsmOpcode():45:58 -> q
     1:1:com.android.tools.r8.ir.code.NumericType getType():31:31 -> r
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.o.n.I:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.q.n.I:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):24:25 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):34:34 -> a
@@ -2951,7 +2962,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):63:63 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> q
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.o.n.J:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.q.n.J:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -2969,14 +2980,14 @@
     34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):106:106 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexType getType():33:33 -> q
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.o.n.K:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.q.n.K:
     1:1:void <init>():19:19 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):23:23 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):28:28 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):47:47 -> a
     boolean emitsIR() -> f
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.o.n.L:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.q.n.L:
     com.android.tools.r8.ir.code.NumericType to -> b
     com.android.tools.r8.ir.code.NumericType from -> a
     boolean $assertionsDisabled -> c
@@ -3009,7 +3020,7 @@
     111:119:int getAsmOpcode():74:82 -> q
     1:1:com.android.tools.r8.ir.code.NumericType getFromType():37:37 -> r
     1:1:com.android.tools.r8.ir.code.NumericType getToType():41:41 -> s
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.o.n.M:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.q.n.M:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):24:26 -> <init>
@@ -3020,7 +3031,7 @@
     boolean emitsIR() -> f
     1:1:com.android.tools.r8.cf.code.CfLabel getLabel():44:44 -> q
     1:1:com.android.tools.r8.ir.code.Position getPosition():40:40 -> r
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.o.n.N:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.q.n.N:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):26:27 -> <init>
     1:13:int getOpcode():35:47 -> a
@@ -3033,7 +3044,7 @@
     boolean isJump() -> l
     boolean isReturn() -> o
     1:1:com.android.tools.r8.ir.code.ValueType getType():31:31 -> q
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.o.n.O:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.q.n.O:
     1:1:void <init>():19:19 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):28:28 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):33:33 -> a
@@ -3042,7 +3053,7 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):52 -> a
     boolean isJump() -> l
     boolean isReturn() -> o
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.o.n.P:
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.q.n.P:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -3170,7 +3181,7 @@
     18:18: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):269 -> b
     boolean emitsIR() -> f
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():89:89 -> q
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.o.n.P$a:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.q.n.P$a:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Swap -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> k
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> i
@@ -3186,7 +3197,7 @@
     10:10:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):38:39 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):25:25 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.o.n.Q:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.q.n.Q:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):27:29 -> <init>
@@ -3203,7 +3214,7 @@
     boolean isStore() -> p
     1:1:int getLocalIndex():74:74 -> q
     1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> r
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.o.n.S:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.q.n.S:
     com.android.tools.r8.cf.code.CfLabel defaultTarget -> b
     int[] keys -> c
     java.util.List targets -> d
@@ -3224,13 +3235,13 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50 -> r
     1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():42:42 -> s
     1:1:java.util.List getSwitchTargets():54:54 -> t
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.o.n.S$a:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.q.n.S$a:
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> b
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.o.n.T:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.q.n.T:
     1:1:void <init>():20:20 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):29:29 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):34:34 -> a
@@ -3239,7 +3250,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):54 -> a
     boolean canThrow() -> e
     boolean isJump() -> l
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.o.n.U:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.q.n.U:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -7218,20 +7229,22 @@
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
-com.android.tools.r8.com.google.common.base.Absent -> com.android.tools.r8.p.a.a.a.a:
+com.android.tools.r8.com.google.common.base.Absent -> com.android.tools.r8.r.a.a.a.a:
     com.android.tools.r8.com.google.common.base.Absent INSTANCE -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():36:36 -> <init>
     1:1:java.lang.Object or(java.lang.Object):50:50 -> a
-com.android.tools.r8.com.google.common.base.Ascii -> com.android.tools.r8.p.a.a.a.b:
+com.android.tools.r8.com.google.common.base.Ascii -> com.android.tools.r8.r.a.a.a.b:
     int com.android.tools.r8.com.google.common.primitives.Ints.saturatedCast(long) -> a
     1:19:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):46:64 -> a
     20:20:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):62:62 -> a
     21:21:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):60:60 -> a
     22:25:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):55:58 -> a
     26:26:boolean com.android.tools.r8.com.google.common.base.Objects.equal(java.lang.Object,java.lang.Object):52:52 -> a
-    27:37:java.lang.String toLowerCase(java.lang.String):403:413 -> a
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.p.a.a.a.o:
+    27:46:java.lang.String com.android.tools.r8.com.google.common.base.Strings.repeat(java.lang.String,int):146:165 -> a
+    47:47:java.lang.String com.android.tools.r8.com.google.common.base.Strings.repeat(java.lang.String,int):155:155 -> a
+    48:58:java.lang.String toLowerCase(java.lang.String):403:413 -> a
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.r.a.a.a.o:
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
@@ -7257,7 +7270,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> b
     1:1:java.util.function.Predicate negate():53:53 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():497:497 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.p.a.a.a.c:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.r.a.a.a.c:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> b
     1:1:void <clinit>():1119:1119 -> <clinit>
     1:1:void <init>():1122:1122 -> <init>
@@ -7267,27 +7280,27 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
     2:2:java.util.function.Predicate negate():1117 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.p.a.a.a.d:
+com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.r.a.a.a.d:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> b
     1:1:void <clinit>():1385:1385 -> <clinit>
     1:1:void <init>():1388:1388 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.p.a.a.a.e:
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.r.a.a.a.e:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> d
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.p.a.a.a.f:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.r.a.a.a.f:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> d
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.p.a.a.a.g:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.r.a.a.a.g:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> b
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.p.a.a.a.h:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.r.a.a.a.h:
     java.lang.String description -> a
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -7302,7 +7315,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1056:1056 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.p.a.a.a.i:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.r.a.a.a.i:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -7313,9 +7326,9 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1629:1629 -> negate
     2:2:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.p.a.a.a.j:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.r.a.a.a.j:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1079:1079 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.p.a.a.a.k:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.r.a.a.a.k:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> b
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -7325,7 +7338,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1312 -> negate
     2:2:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.p.a.a.a.l:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.r.a.a.a.l:
     char[] rangeStarts -> b
     char[] rangeEnds -> c
     java.lang.String description -> a
@@ -7337,24 +7350,24 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.negate():497:497 -> negate
     1:1:java.util.function.Predicate negate():1398 -> negate
     1:1:java.lang.String toString():1430:1430 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.p.a.a.a.m:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.r.a.a.a.m:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> d
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.p.a.a.a.n:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.r.a.a.a.n:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> c
     int SHIFT -> b
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.p.a.a.a.p:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.r.a.a.a.p:
     java.nio.charset.Charset UTF_8 -> a
     1:50:void <clinit>():45:94 -> <clinit>
-com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.p.a.a.a.q:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.r.a.a.a.q:
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence) -> a
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.p.a.a.a.v:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.r.a.a.a.v:
     1:1:void <init>():41:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence equals():323:323 -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence identity():336:336 -> b
@@ -7365,14 +7378,14 @@
     1:1:com.android.tools.r8.com.google.common.base.Equivalence pairwise():259:259 -> pairwise
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> wrap
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.p.a.a.a.r:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.p.a.a.a.s:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.r.a.a.a.r:
+com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.r.a.a.a.s:
     com.android.tools.r8.com.google.common.base.Equivalence$Equals INSTANCE -> a
     1:1:void <clinit>():341:341 -> <clinit>
     1:1:void <init>():339:339 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):345:345 -> doEquivalent
     1:1:int doHash(java.lang.Object):350:350 -> doHash
-com.android.tools.r8.com.google.common.base.Equivalence$EquivalentToPredicate -> com.android.tools.r8.p.a.a.a.t:
+com.android.tools.r8.com.google.common.base.Equivalence$EquivalentToPredicate -> com.android.tools.r8.r.a.a.a.t:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object target -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):277:279 -> <init>
@@ -7382,12 +7395,12 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():301 -> hashCode
     1:1:java.lang.String toString():306:306 -> toString
-com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.p.a.a.a.u:
+com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.r.a.a.a.u:
     com.android.tools.r8.com.google.common.base.Equivalence$Identity INSTANCE -> a
     1:1:void <clinit>():362:362 -> <clinit>
     1:1:void <init>():360:360 -> <init>
     1:1:int doHash(java.lang.Object):371:371 -> doHash
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.p.a.a.a.v$a:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.r.a.a.a.v$a:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     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):183:183 -> <init>
@@ -7396,8 +7409,8 @@
     1:11:boolean equals(java.lang.Object):208:218 -> equals
     1:1:int hashCode():229:229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.p.a.a.a.w:
-com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.p.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.r.a.a.a.w:
+com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.r.a.a.a.x:
     com.android.tools.r8.com.google.common.base.Function function -> a
     com.android.tools.r8.com.google.common.base.Equivalence resultEquivalence -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Function,com.android.tools.r8.com.google.common.base.Equivalence):39:41 -> <init>
@@ -7408,72 +7421,64 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():68 -> hashCode
     1:1:java.lang.String toString():73:73 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.p.a.a.a.z:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.r.a.a.a.z:
     java.util.regex.Pattern pattern -> a
     1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
     1:4:boolean equals(java.lang.Object):60:63 -> equals
     1:1:int hashCode():55:55 -> hashCode
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.p.a.a.a.y:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.r.a.a.a.y:
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
     1:1:void <init>(java.util.regex.Matcher):69 -> <init>
     2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.p.a.a.a.D:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.r.a.a.a.D:
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62:62 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.not(com.android.tools.r8.com.google.common.base.Predicate):88:88 -> a
     3:7: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):97:101 -> a
     8:8:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean):121:121 -> a
     9:9:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.Object):135:135 -> a
-    10:29:java.lang.String com.android.tools.r8.com.google.common.base.Strings.repeat(java.lang.String,int):146:165 -> a
-    30:30:java.lang.String com.android.tools.r8.com.google.common.base.Strings.repeat(java.lang.String,int):155:155 -> a
-    31:31:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
-    32:32:java.util.List com.android.tools.r8.com.google.common.base.Predicates.asList(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):722:722 -> a
-    32:32:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
-    33:33:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
-    34:34:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    34:34:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
-    35:35:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    35:35:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
-    36:36:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,char):170:170 -> a
-    37:45:java.lang.String com.android.tools.r8.com.google.common.base.Strings.commonPrefix(java.lang.CharSequence,java.lang.CharSequence):180:188 -> a
-    46:46:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    46:46:java.lang.String com.android.tools.r8.com.google.common.base.Strings.commonPrefix(java.lang.CharSequence,java.lang.CharSequence):178 -> a
-    47:47:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    47:47:java.lang.String com.android.tools.r8.com.google.common.base.Strings.commonPrefix(java.lang.CharSequence,java.lang.CharSequence):177 -> a
-    48:48:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):181:181 -> a
-    49:49:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):192:192 -> a
-    50:50:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,java.lang.Object):204:204 -> a
-    51:53:boolean com.android.tools.r8.com.google.common.base.Strings.validSurrogatePairAt(java.lang.CharSequence,int):222:224 -> a
-    54:54:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int,int):276:276 -> a
-    55:55:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,java.lang.Object,java.lang.Object):396:396 -> a
-    56:56:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    57:57:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):805:805 -> a
-    58:58:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
-    58:58:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
-    59:59:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1207:1207 -> a
-    59:59:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
-    59:59:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
-    60:60:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1205:1205 -> a
-    60:60:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
-    60:60:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
-    61:61:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1203:1203 -> a
-    61:61:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
-    61:61:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
-    62:62:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
-    62:62:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
-    63:67:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndex(int,int,java.lang.String):1248:1252 -> a
-    68:68:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndex(int,int,java.lang.String):1250:1250 -> a
-    69:69:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271:1271 -> a
-    70:70:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1283:1283 -> a
-    70:70:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271 -> a
-    71:71:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1280:1280 -> a
-    71:71:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271 -> a
-    72:72:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1277:1277 -> a
-    72:72:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271 -> a
-    73:73:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271:1271 -> a
-    74:102:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.format(java.lang.String,java.lang.Object[]):1298:1326 -> a
+    10:10:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
+    11:11:java.util.List com.android.tools.r8.com.google.common.base.Predicates.asList(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):722:722 -> a
+    11:11:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
+    12:12:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
+    13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    13:13:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
+    14:14:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    14:14:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
+    15:15:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,char):170:170 -> a
+    16:16:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):181:181 -> a
+    17:17:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):192:192 -> a
+    18:18:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,java.lang.Object):204:204 -> a
+    19:19:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int,int):276:276 -> a
+    20:20:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,java.lang.Object,java.lang.Object):396:396 -> a
+    21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):805:805 -> a
+    23:23:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
+    23:23:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
+    24:24:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1207:1207 -> a
+    24:24:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
+    24:24:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
+    25:25:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1205:1205 -> a
+    25:25:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
+    25:25:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
+    26:26:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badElementIndex(int,int,java.lang.String):1203:1203 -> a
+    26:26:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196 -> a
+    26:26:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
+    27:27:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int,java.lang.String):1196:1196 -> a
+    27:27:int com.android.tools.r8.com.google.common.base.Preconditions.checkElementIndex(int,int):1178 -> a
+    28:32:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndex(int,int,java.lang.String):1248:1252 -> a
+    33:33:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndex(int,int,java.lang.String):1250:1250 -> a
+    34:34:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271:1271 -> a
+    35:35:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1283:1283 -> a
+    35:35:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271 -> a
+    36:36:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1280:1280 -> a
+    36:36:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271 -> a
+    37:37:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.badPositionIndexes(int,int,int):1277:1277 -> a
+    37:37:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271 -> a
+    38:38:void com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndexes(int,int,int):1271:1271 -> a
+    39:67:java.lang.String com.android.tools.r8.com.google.common.base.Preconditions.format(java.lang.String,java.lang.Object[]):1298:1326 -> a
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysTrue():54:54 -> b
     2:2:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper toStringHelper(java.lang.Object):100:100 -> b
     3:3:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean):443:443 -> b
@@ -7483,8 +7488,8 @@
     6:6:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.p.a.a.a.A:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.p.a.a.a.C:
+com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.r.a.a.a.A:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.r.a.a.a.C:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderTail -> c
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderHead -> b
     java.lang.String className -> a
@@ -7501,18 +7506,18 @@
     5:5:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper addHolder(java.lang.String,java.lang.Object):372 -> b
     1:20:java.lang.String toString():331:350 -> toString
     21:39:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.p.a.a.a.B:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.r.a.a.a.B:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder next -> c
     java.lang.Object value -> b
     java.lang.String name -> a
     1:1:void <init>():376:376 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.MoreObjects$1):376:376 -> <init>
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.p.a.a.a.E:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.r.a.a.a.E:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.PairwiseEquivalence -> com.android.tools.r8.p.a.a.a.F:
+com.android.tools.r8.com.google.common.base.PairwiseEquivalence -> com.android.tools.r8.r.a.a.a.F:
     com.android.tools.r8.com.google.common.base.Equivalence elementEquivalence -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):27:28 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):22:22 -> doEquivalent
@@ -7524,7 +7529,7 @@
     1:3:boolean equals(java.lang.Object):56:58 -> equals
     1:1:int hashCode():66:66 -> hashCode
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.p.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.r.a.a.a.I:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -7544,21 +7549,21 @@
     2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.p.a.a.a.G:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.p.a.a.a.H:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.r.a.a.a.G:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.r.a.a.a.H:
     1:1:void <init>():95:95 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95:95 -> <init>
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.p.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.r.a.a.a.J:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.p.a.a.a.K:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.p.a.a.a.L:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.r.a.a.a.K:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.r.a.a.a.L:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):341:342 -> <init>
     1:1:boolean apply(java.lang.Object):347:347 -> apply
     1:3:boolean equals(java.lang.Object):357:359 -> equals
     1:1:int hashCode():352:352 -> hashCode
     1:1:java.lang.String toString():366:366 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.p.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.r.a.a.a.Q:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> c
@@ -7566,15 +7571,15 @@
     1:37:void <clinit>():283:319 -> <clinit>
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281:281 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.p.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.r.a.a.a.M:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.p.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.r.a.a.a.N:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.p.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.r.a.a.a.O:
     1:1:void <init>(java.lang.String,int):307:307 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.p.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.r.a.a.a.P:
     1:1:void <init>(java.lang.String,int):319:319 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.p.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.r.a.a.a.S:
     java.util.List components -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):415:415 -> <init>
     2:3:void <init>(java.util.List):418:419 -> <init>
@@ -7585,7 +7590,7 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):457:466 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):43 -> toString
     2:11:java.lang.String toString():450 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.p.a.a.a.U:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.r.a.a.a.U:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
@@ -7598,24 +7603,24 @@
     10:10:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.p.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.r.a.a.a.T:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.p.a.a.a.V:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.p.a.a.a.W:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.r.a.a.a.V:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.r.a.a.a.W:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):114:115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.p.a.a.a.X:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.r.a.a.a.X:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):150:151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.p.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.r.a.a.a.Y:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -7645,7 +7650,7 @@
     8:8:void throwIfUnchecked(java.lang.Throwable):130:130 -> a
     8:8:void propagateIfPossible(java.lang.Throwable):159 -> a
     8:8:void propagateIfPossible(java.lang.Throwable,java.lang.Class):185 -> a
-com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.p.a.a.b.a:
+com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.r.a.a.b.a:
     int position -> b
     int size -> a
     1:1:void <init>(int):52:52 -> <init>
@@ -7659,7 +7664,7 @@
     1:4:java.lang.Object previous():97:100 -> previous
     5:5:java.lang.Object previous():98:98 -> previous
     1:1:int previousIndex():105:105 -> previousIndex
-com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.p.a.a.b.c:
+com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.r.a.a.b.c:
     java.lang.Object next -> b
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State state -> a
     1:1:void <init>():68:68 -> <init>
@@ -7671,7 +7676,7 @@
     3:6:boolean hasNext():140 -> hasNext
     1:6:java.lang.Object next():156:161 -> next
     7:7:java.lang.Object next():157:157 -> next
-com.android.tools.r8.com.google.common.collect.AbstractIterator$State -> com.android.tools.r8.p.a.a.b.b:
+com.android.tools.r8.com.google.common.collect.AbstractIterator$State -> com.android.tools.r8.r.a.a.b.b:
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State[] $VALUES -> e
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State DONE -> c
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State NOT_READY -> b
@@ -7680,14 +7685,14 @@
     1:10:void <clinit>():72:81 -> <clinit>
     11:11:void <clinit>():70:70 -> <clinit>
     1:1:void <init>(java.lang.String,int):70:70 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractListMultimap -> com.android.tools.r8.p.a.a.b.d:
+com.android.tools.r8.com.google.common.collect.AbstractListMultimap -> com.android.tools.r8.r.a.a.b.d:
     1:1:void <init>(java.util.Map):45:45 -> <init>
     1:1:java.util.Map asMap():117:117 -> b
     1:1:boolean equals(java.lang.Object):129:129 -> equals
     1:1:java.util.Collection get(java.lang.Object):35:35 -> get
     2:2:java.util.List get(java.lang.Object):67:67 -> get
     1:1:boolean put(java.lang.Object,java.lang.Object):106:106 -> put
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap -> com.android.tools.r8.p.a.a.b.f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap -> com.android.tools.r8.r.a.a.b.f:
     int totalSize -> f
     java.util.Map map -> e
     1:3:void <init>(java.util.Map):122:124 -> <init>
@@ -7735,9 +7740,9 @@
     2:2:boolean put(java.lang.Object,java.lang.Object):194 -> put
     3:11:boolean put(java.lang.Object,java.lang.Object):195:203 -> put
     1:1:int size():180:180 -> size
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2 -> com.android.tools.r8.p.a.a.b.e:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2 -> com.android.tools.r8.r.a.a.b.e:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):1253:1253 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> com.android.tools.r8.p.a.a.b.f$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> com.android.tools.r8.r.a.a.b.f$a:
     java.util.Map submap -> c
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):1301:1302 -> <init>
@@ -7765,7 +7770,7 @@
     1:9:java.lang.Object remove(java.lang.Object):1293 -> remove
     1:1:int size():1335:1335 -> size
     1:1:java.lang.String toString():1364:1364 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapEntries -> com.android.tools.r8.p.a.a.b.f$a$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapEntries -> com.android.tools.r8.r.a.a.b.f$a$a:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap this$1 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap):1382:1382 -> <init>
     1:1:java.util.Map map():1385:1385 -> a
@@ -7778,7 +7783,7 @@
     1:1:java.util.Iterator iterator():1390:1390 -> iterator
     1:5:boolean remove(java.lang.Object):1407:1411 -> remove
     1:1:java.util.Spliterator spliterator():1395:1395 -> spliterator
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapIterator -> com.android.tools.r8.p.a.a.b.f$a$b:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapIterator -> com.android.tools.r8.r.a.a.b.f$a$b:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap this$1 -> c
     java.util.Collection collection -> b
     java.util.Iterator delegateIterator -> a
@@ -7787,7 +7792,7 @@
     1:3:java.util.Map$Entry next():1428:1430 -> next
     1:3:java.lang.Object next():1417 -> next
     1:3:void remove():1435:1437 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr -> com.android.tools.r8.p.a.a.b.f$b:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr -> com.android.tools.r8.r.a.a.b.f$b:
     java.util.Iterator valueIterator -> d
     java.util.Collection collection -> c
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> e
@@ -7801,7 +7806,7 @@
     8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2.output(java.lang.Object,java.lang.Object):1253 -> next
     8:8:java.lang.Object next():1182 -> next
     1:5:void remove():1187:1191 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet -> com.android.tools.r8.p.a.a.b.f$c:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet -> com.android.tools.r8.r.a.a.b.f$c:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):943:944 -> <init>
     1:1:void clear():996:996 -> clear
@@ -7830,7 +7835,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> spliterator
     1:1:java.util.Spliterator spliterator():979 -> spliterator
     2:2:java.util.Spliterator spliterator():979:979 -> spliterator
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet$1 -> com.android.tools.r8.p.a.a.b.g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet$1 -> com.android.tools.r8.r.a.a.b.g:
     java.util.Map$Entry entry -> a
     java.util.Iterator val$entryIterator -> b
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet this$1 -> c
@@ -7838,7 +7843,7 @@
     1:1:boolean hasNext():955:955 -> hasNext
     1:2:java.lang.Object next():960:961 -> next
     1:5:void remove():966:970 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> com.android.tools.r8.p.a.a.b.f$d:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> com.android.tools.r8.r.a.a.b.f$d:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> g
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1500:1501 -> <init>
     1:8:java.util.Map$Entry pollAsMapEntry(java.util.Iterator):1576:1583 -> a
@@ -7884,7 +7889,7 @@
     2:2:java.util.NavigableMap tailMap(java.lang.Object,boolean):1639:1639 -> tailMap
     2:2:java.util.NavigableMap tailMap(java.lang.Object):1634 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):1498 -> tailMap
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableKeySet -> com.android.tools.r8.p.a.a.b.f$e:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableKeySet -> com.android.tools.r8.r.a.a.b.f$e:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1059:1060 -> <init>
     1:1:java.util.SortedMap sortedMap():1057:1057 -> a
@@ -7916,9 +7921,9 @@
     2:2:java.util.NavigableSet tailSet(java.lang.Object,boolean):1137:1137 -> tailSet
     2:2:java.util.NavigableSet tailSet(java.lang.Object):1132 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1057 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> com.android.tools.r8.p.a.a.b.f$f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> com.android.tools.r8.r.a.a.b.f$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):926:926 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> com.android.tools.r8.p.a.a.b.f$g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> com.android.tools.r8.r.a.a.b.f$g:
     java.util.SortedSet sortedKeySet -> e
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1444:1445 -> <init>
@@ -7932,7 +7937,7 @@
     1:1:java.lang.Object lastKey():1464:1464 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):1474:1474 -> subMap
     1:1:java.util.SortedMap tailMap(java.lang.Object):1479:1479 -> tailMap
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedKeySet -> com.android.tools.r8.p.a.a.b.f$h:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedKeySet -> com.android.tools.r8.r.a.a.b.f$h:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1018:1019 -> <init>
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> a
@@ -7944,7 +7949,7 @@
     1:1:java.lang.Object last():1043:1043 -> last
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1048:1048 -> subSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1053:1053 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection -> com.android.tools.r8.p.a.a.b.f$i:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection -> com.android.tools.r8.r.a.a.b.f$i:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection ancestor -> c
     java.util.Collection ancestorDelegate -> d
     java.util.Collection delegate -> b
@@ -7974,7 +7979,7 @@
     1:2:int size():422:423 -> size
     1:2:java.util.Spliterator spliterator():459:460 -> spliterator
     1:2:java.lang.String toString():443:444 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator -> com.android.tools.r8.p.a.a.b.f$i$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator -> com.android.tools.r8.r.a.a.b.f$i$a:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection this$1 -> c
     java.util.Collection originalDelegate -> b
     java.util.Iterator delegateIterator -> a
@@ -7986,7 +7991,7 @@
     1:2:boolean hasNext():489:490 -> hasNext
     1:2:java.lang.Object next():495:496 -> next
     1:3:void remove():501:503 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList -> com.android.tools.r8.p.a.a.b.f$j:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList -> com.android.tools.r8.r.a.a.b.f$j:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):780:781 -> <init>
     1:1:void add(int,java.lang.Object):819:819 -> add
@@ -8063,7 +8068,7 @@
     8:8:java.util.List com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.wrapList(java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):331:331 -> subList
     8:8:java.util.List com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):91 -> subList
     8:8:java.util.List subList(int,int):864 -> subList
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList$WrappedListIterator -> com.android.tools.r8.p.a.a.b.f$j$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList$WrappedListIterator -> com.android.tools.r8.r.a.a.b.f$j$a:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList this$1 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList):872:872 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList,int):874:875 -> <init>
@@ -8076,7 +8081,7 @@
     1:1:java.lang.Object previous():889:889 -> previous
     1:1:int previousIndex():899:899 -> previousIndex
     1:1:void set(java.lang.Object):904:904 -> set
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedNavigableSet -> com.android.tools.r8.p.a.a.b.f$k:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedNavigableSet -> com.android.tools.r8.r.a.a.b.f$k:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> g
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.NavigableSet,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):706:707 -> <init>
     1:1:java.util.NavigableSet wrap(java.util.NavigableSet):746:746 -> a
@@ -8106,11 +8111,11 @@
     1:1:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):763:763 -> subSet
     2:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):762:762 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):773:773 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSet -> com.android.tools.r8.p.a.a.b.f$l:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSet -> com.android.tools.r8.r.a.a.b.f$l:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.Set):621:622 -> <init>
     1:13:boolean removeAll(java.util.Collection):627:639 -> removeAll
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet -> com.android.tools.r8.p.a.a.b.f$m:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet -> com.android.tools.r8.r.a.a.b.f$m:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.SortedSet,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):650:651 -> <init>
     1:1:java.util.Comparator comparator():660:660 -> comparator
@@ -8140,7 +8145,7 @@
     5:5:com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.getAncestor():527:527 -> tailSet
     5:5:java.util.SortedSet tailSet(java.lang.Object):699 -> tailSet
     6:6:java.util.SortedSet tailSet(java.lang.Object):699:699 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset -> com.android.tools.r8.p.a.a.b.j:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset -> com.android.tools.r8.r.a.a.b.j:
     java.util.Map backingMap -> c
     long size -> d
     1:3:void <init>(java.util.Map):60:62 -> <init>
@@ -8163,7 +8168,7 @@
     1:2:java.util.Iterator entryIterator():86:87 -> d
     1:1:java.util.Set entrySet():81:81 -> entrySet
     1:1:int size():152:152 -> size
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 -> com.android.tools.r8.p.a.a.b.i:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 -> com.android.tools.r8.r.a.a.b.i:
     java.util.Map$Entry toRemove -> a
     java.util.Iterator val$backingEntries -> b
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset this$0 -> c
@@ -8172,7 +8177,7 @@
     1:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry next():97:99 -> next
     1:3:java.lang.Object next():87 -> next
     1:4:void remove():121:124 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1$1 -> com.android.tools.r8.p.a.a.b.h:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1$1 -> com.android.tools.r8.r.a.a.b.h:
     java.util.Map$Entry val$mapEntry -> a
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1,java.util.Map$Entry):99:99 -> <init>
@@ -8181,7 +8186,7 @@
     4:4:int getCount():109 -> a
     5:10:int getCount():109:114 -> a
     1:1:java.lang.Object getElement():102:102 -> b
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> com.android.tools.r8.p.a.a.b.j$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> com.android.tools.r8.r.a.a.b.j$a:
     java.util.Map$Entry currentEntry -> b
     java.util.Iterator entryIterator -> a
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset this$0 -> e
@@ -8192,13 +8197,13 @@
     1:7:java.lang.Object next():182:188 -> next
     1:10:void remove():193:202 -> remove
     11:11:void remove():196:196 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapEntry -> com.android.tools.r8.p.a.a.b.k:
+com.android.tools.r8.com.google.common.collect.AbstractMapEntry -> com.android.tools.r8.r.a.a.b.k:
     1:1:void <init>():31:31 -> <init>
     1:4:boolean equals(java.lang.Object):46:49 -> equals
     1:3:int hashCode():56:58 -> hashCode
     1:1:java.lang.Object setValue(java.lang.Object):41:41 -> setValue
     1:1:java.lang.String toString():66:66 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMultimap -> com.android.tools.r8.p.a.a.b.m:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap -> com.android.tools.r8.r.a.a.b.m:
     java.util.Map asMap -> d
     java.util.Collection entries -> a
     java.util.Set keySet -> b
@@ -8221,14 +8226,14 @@
     1:2:java.util.Set keySet():168:169 -> keySet
     1:2:boolean remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:1:java.lang.String toString():274:274 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMultimap$1 -> com.android.tools.r8.p.a.a.b.l:
-com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries -> com.android.tools.r8.p.a.a.b.m$a:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap$1 -> com.android.tools.r8.r.a.a.b.l:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries -> com.android.tools.r8.r.a.a.b.m$a:
     com.android.tools.r8.com.google.common.collect.AbstractMultimap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultimap):127:127 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultimap,com.android.tools.r8.com.google.common.collect.AbstractMultimap$1):127:127 -> <init>
     1:1:java.util.Iterator iterator():135:135 -> iterator
     1:1:java.util.Spliterator spliterator():140:140 -> spliterator
-com.android.tools.r8.com.google.common.collect.AbstractMultiset -> com.android.tools.r8.p.a.a.b.n:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset -> com.android.tools.r8.r.a.a.b.n:
     java.util.Set elementSet -> a
     java.util.Set entrySet -> b
     1:1:void <init>():47:47 -> <init>
@@ -8269,16 +8274,16 @@
     1:4:int com.android.tools.r8.com.google.common.collect.Multisets.sizeImpl(com.android.tools.r8.com.google.common.collect.Multiset):1138:1141 -> size
     1:4:int size():52 -> size
     1:1:java.lang.String toString():248:248 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet -> com.android.tools.r8.p.a.a.b.n$a:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet -> com.android.tools.r8.r.a.a.b.n$a:
     com.android.tools.r8.com.google.common.collect.AbstractMultiset this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultiset):171:171 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractMultiset$EntrySet -> com.android.tools.r8.p.a.a.b.n$b:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset$EntrySet -> com.android.tools.r8.r.a.a.b.n$b:
     com.android.tools.r8.com.google.common.collect.AbstractMultiset this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultiset):194:194 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():197:197 -> a
     1:1:java.util.Iterator iterator():202:202 -> iterator
     1:1:int size():207:207 -> size
-com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.p.a.a.b.o:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.r.a.a.b.o:
     int expectedValuesPerKey -> g
     1:1:void <init>():112:112 -> <init>
     2:2:void com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies.<init>(java.util.Map):36:36 -> <init>
@@ -8305,10 +8310,10 @@
     1:1:int size():65:65 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():65 -> toString
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.p.a.a.b.p:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.r.a.a.b.p:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> f
-com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.p.a.a.b.q:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.r.a.a.b.q:
     java.util.stream.Collector TO_IMMUTABLE_SET -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
@@ -8318,7 +8323,7 @@
     3:3:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):58 -> a
     4:4:void lambda$toImmutableMap$1(java.util.function.Function,java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Object):62:62 -> a
     5:5:java.util.stream.Collector toImmutableSet():75:75 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.p.a.a.b.r:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.r.a.a.b.r:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):105:105 -> <init>
@@ -8329,7 +8334,7 @@
     1:1:void forEachRemaining(java.util.function.Consumer):115:115 -> forEachRemaining
     1:1:boolean tryAdvance(java.util.function.Consumer):109:109 -> tryAdvance
     1:2:java.util.Spliterator trySplit():120:121 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.p.a.a.b.s:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.r.a.a.b.s:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -8343,7 +8348,7 @@
     1:6:void forEachRemaining(java.util.function.Consumer):242:247 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):226:234 -> tryAdvance
     1:16:java.util.Spliterator trySplit():252:267 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.p.a.a.b.t:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.r.a.a.b.t:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -8359,7 +8364,7 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):140 -> trySplit
     4:4:java.util.Spliterator trySplit():167 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.p.a.a.b.u:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.r.a.a.b.u:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -8370,7 +8375,7 @@
     1:4:java.util.Comparator getComparator():87:90 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):60:60 -> tryAdvance
     1:2:java.util.Spliterator trySplit():71:72 -> trySplit
-com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.p.a.a.b.v:
+com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.r.a.a.b.v:
     java.util.Spliterator com.android.tools.r8.com.google.common.collect.Streams.lambda$concat$0(java.util.Spliterator) -> a
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkEntryNotNull(java.lang.Object,java.lang.Object):34:34 -> a
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
@@ -8548,14 +8553,14 @@
     4:4:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466 -> f
     5:5:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466:466 -> f
     1:1:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> g
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.p.a.a.b.w:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.r.a.a.b.w:
     java.util.Comparator comparator -> a
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):37:37 -> compare
     1:3:boolean equals(java.lang.Object):45:47 -> equals
     1:1:int hashCode():54:54 -> hashCode
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.p.a.a.b.x:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.r.a.a.b.x:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -8566,11 +8571,11 @@
     1:1:boolean equals(java.lang.Object):63:63 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.p.a.a.b.y:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.r.a.a.b.y:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> g
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():31:31 -> <init>
-com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.p.a.a.b.B:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.r.a.a.b.B:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> a
     1:2:void <init>():117:118 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):190:190 -> a
@@ -8585,18 +8590,18 @@
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):293:302 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):253 -> toString
     3:12:java.lang.String toString():336 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.p.a.a.b.A:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.r.a.a.b.A:
     java.lang.Iterable[] val$inputs -> b
     1:1:void <init>(java.lang.Iterable[]):261:261 -> <init>
     1:1:java.util.Iterator iterator():264:264 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     2:2:java.util.Iterator iterator():264 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.p.a.a.b.z:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.r.a.a.b.z:
     com.android.tools.r8.com.google.common.collect.FluentIterable$2 this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$2,int):266:266 -> <init>
     1:1:java.util.Iterator get(int):269:269 -> a
     1:1:java.lang.Object get(int):266 -> a
-com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.p.a.a.b.C:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.r.a.a.b.C:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingObject.<init>():55:55 -> <init>
     1:1:void <init>():55 -> <init>
     java.lang.Object com.android.tools.r8.com.google.common.collect.ForwardingObject.delegate() -> a
@@ -8616,7 +8621,7 @@
     2:2:java.lang.Object[] toArray(java.lang.Object[]):128:128 -> toArray
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():72:72 -> toString
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():0 -> toString
-com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.p.a.a.b.D:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.r.a.a.b.D:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingSet.<init>():55:55 -> <init>
     1:1:void <init>():62 -> <init>
     java.util.Set com.android.tools.r8.com.google.common.collect.ForwardingSet.delegate() -> a
@@ -8631,7 +8636,7 @@
     1:1:java.lang.Object last():84:84 -> last
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):89:89 -> subSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):94:94 -> tailSet
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.p.a.a.b.I:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.r.a.a.b.I:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableVToK -> b
@@ -8710,19 +8715,19 @@
     1:1:java.util.Set values():469:469 -> values
     1:1:java.util.Collection values():57 -> values
     2:2:java.util.Set values():469:469 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.p.a.a.b.E:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.r.a.a.b.E:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):474:474 -> <init>
     1:1:java.util.Map$Entry output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):477:477 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):474 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.p.a.a.b.E$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.r.a.a.b.E$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> b
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):483:484 -> <init>
     1:1:java.lang.Object getKey():489:489 -> getKey
     1:1:java.lang.Object getValue():494:494 -> getValue
     1:17:java.lang.Object setValue(java.lang.Object):499:515 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.p.a.a.b.F:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.r.a.a.b.F:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInVToKBucket -> f
     int valueHash -> d
@@ -8730,7 +8735,7 @@
     int keyHash -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> h
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):99:101 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.p.a.a.b.I$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.r.a.a.b.I$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):550:550 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):550:550 -> <init>
@@ -8771,27 +8776,27 @@
     3:3:com.android.tools.r8.com.google.common.collect.BiMap forward():553:553 -> values
     3:3:java.util.Set values():640 -> values
     4:4:java.util.Set values():640:640 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.p.a.a.b.G:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.r.a.a.b.G:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):645:645 -> <init>
     1:1:java.util.Map$Entry output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):648:648 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):645 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.p.a.a.b.G$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.r.a.a.b.G$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> b
     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):654:655 -> <init>
     1:1:java.lang.Object getKey():660:660 -> getKey
     1:1:java.lang.Object getValue():665:665 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):670:681 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.p.a.a.b.I$a$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.r.a.a.b.I$a$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):612:613 -> <init>
     1:1:java.util.Iterator iterator():629:629 -> iterator
     1:5:boolean remove(java.lang.Object):618:622 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.p.a.a.b.H:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.r.a.a.b.H:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):629:629 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):632:632 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.p.a.a.b.I$b:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.r.a.a.b.I$b:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> b
@@ -8804,15 +8809,15 @@
     9:9:java.lang.Object next():409:409 -> next
     1:7:void remove():420:426 -> remove
     8:8:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.p.a.a.b.I$c:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.r.a.a.b.I$c:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):439:440 -> <init>
     1:1:java.util.Iterator iterator():445:445 -> iterator
     1:7:boolean remove(java.lang.Object):455:461 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.p.a.a.b.J:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.r.a.a.b.J:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):445:445 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):448:448 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.p.a.a.b.K:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.r.a.a.b.K:
     1:1:void <init>():70:70 -> <init>
     1:1:int remove(java.lang.Object,int):33:33 -> a
     2:2:boolean setCount(java.lang.Object,int,int):33:33 -> a
@@ -8843,14 +8848,14 @@
     1:1:int size():33:33 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultiset.toString():248:248 -> toString
     1:1:java.lang.String toString():33 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.p.a.a.b.L:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.r.a.a.b.L:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean isPartialView():56:56 -> b
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> g
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.p.a.a.b.M:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.r.a.a.b.M:
     1:1:void <init>():341:341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> f
@@ -8863,7 +8868,7 @@
     2:2:java.util.Collection values():36 -> values
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet values():358:358 -> values
     3:3:java.util.Set values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.p.a.a.b.M$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.r.a.a.b.M$a:
     1:1:void <init>():159:159 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():153:153 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder put(java.lang.Object,java.lang.Object):172:172 -> a
@@ -8877,9 +8882,9 @@
     31:31:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> a
     32:32:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> a
     32:32:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.p.a.a.b.N:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.r.a.a.b.N:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.p.a.a.b.Q:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.r.a.a.b.Q:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -8906,7 +8911,7 @@
     15:18:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
     19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toArray
     19:19:java.lang.Object[] toArray(java.lang.Object[]):197 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.p.a.a.b.O:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.r.a.a.b.O:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -8922,19 +8927,19 @@
     18:20:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):510:512 -> a
     21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):509 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.p.a.a.b.P:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.r.a.a.b.P:
     1:1:void <init>():370:370 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object) -> a
     1:1:int expandedCapacity(int,int):361:361 -> a
     2:2:int expandedCapacity(int,int):356:356 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.p.a.a.b.S:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.r.a.a.b.S:
     java.lang.Object value -> b
     java.lang.Object key -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):31:33 -> <init>
     1:1:java.lang.Object getKey():39:39 -> getKey
     1:1:java.lang.Object getValue():45:45 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):50:50 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.p.a.a.b.T:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.r.a.a.b.T:
     java.util.EnumMap delegate -> e
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.<init>():445:445 -> <init>
     1:1:void <init>(java.util.EnumMap):51 -> <init>
@@ -8969,7 +8974,7 @@
     1:1:int size():68:68 -> size
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():445:445 -> values
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():0 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.p.a.a.b.U:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.r.a.a.b.U:
     java.util.EnumSet delegate -> c
     int hashCode -> d
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -8992,7 +8997,7 @@
     1:1:int size():84:84 -> size
     1:1:java.util.Spliterator spliterator():74:74 -> spliterator
     1:1:java.lang.String toString():132:132 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.p.a.a.b.W:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.r.a.a.b.W:
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object):93:93 -> a
@@ -9064,11 +9069,11 @@
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object):93:93 -> subList
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):442 -> subList
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):444:444 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.p.a.a.b.V:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.r.a.a.b.V:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):393:393 -> <init>
     1:1:java.lang.Object get(int):396:396 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.p.a.a.b.W$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.r.a.a.b.W$a:
     1:1:void <init>():739:739 -> <init>
     2:2:void <init>(int):744:744 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):757:757 -> a
@@ -9078,7 +9083,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object[]):787:787 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):809:809 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList build():819:819 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.p.a.a.b.X:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.r.a.a.b.X:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean isPartialView():657:657 -> b
@@ -9111,7 +9116,7 @@
     5:5:int reversePosition(int):613 -> subList
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):641 -> subList
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):641:641 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.p.a.a.b.W$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.r.a.a.b.W$b:
     int offset -> b
     int length -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
@@ -9128,11 +9133,11 @@
     1:1:int size():468:468 -> size
     1:1:java.util.List subList(int,int):457:457 -> subList
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):479:480 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.p.a.a.b.Z:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.r.a.a.b.Z:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):405:406 -> get
     1:2:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.p.a.a.b.Y:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.r.a.a.b.Y:
     1:1:void <init>():237:237 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.put(java.lang.Object,java.lang.Object):168:169 -> a
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):242 -> a
@@ -9168,7 +9173,7 @@
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328 -> a
     28:28:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328:328 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.p.a.a.b.b0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.r.a.a.b.b0:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> c
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet keySet -> b
@@ -9249,12 +9254,12 @@
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():733:734 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.p.a.a.b.a0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.r.a.a.b.a0:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):707:707 -> <init>
     1:1:boolean hasNext():710:710 -> hasNext
     1:1:java.lang.Object next():715:715 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.p.a.a.b.b0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.r.a.a.b.b0$a:
     java.util.Map$Entry[] entries -> a
     int size -> b
     boolean entriesUsed -> c
@@ -9273,28 +9278,28 @@
     25:25:com.android.tools.r8.com.google.common.collect.ImmutableMap build():371 -> a
     26:26:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():113:113 -> a
     26:26:com.android.tools.r8.com.google.common.collect.ImmutableMap build():369 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.p.a.a.b.c0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.r.a.a.b.c0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):463:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> iterator
     2:2:java.util.Iterator iterator():462 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.p.a.a.b.f0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.r.a.a.b.f0:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> e
     boolean isReusable() -> f
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.p.a.a.b.d0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.r.a.a.b.d0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> d
     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):104:105 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():111:111 -> e
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.p.a.a.b.e0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.r.a.a.b.e0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> c
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):79:80 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():86:86 -> d
     boolean isReusable() -> f
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.p.a.a.b.h0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.r.a.a.b.h0:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean isPartialView():98:98 -> b
     1:4:boolean contains(java.lang.Object):88:91 -> contains
@@ -9302,7 +9307,7 @@
     1:1:int hashCode():109:109 -> hashCode
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> j
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.p.a.a.b.g0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.r.a.a.b.g0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     java.util.Map$Entry[] entries -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -9317,7 +9322,7 @@
     2:2:java.util.Iterator iterator():39 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> j
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.p.a.a.b.i0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.r.a.a.b.i0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -9332,7 +9337,7 @@
     2:2:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.p.a.a.b.l0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.r.a.a.b.l0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):40:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):37:37 -> a
@@ -9358,19 +9363,19 @@
     2:2:java.util.Iterator iterator():36 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.p.a.a.b.j0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.r.a.a.b.j0:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> a
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):51:52 -> <init>
     1:1:boolean hasNext():56:56 -> hasNext
     1:1:java.lang.Object next():61:61 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.p.a.a.b.k0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.r.a.a.b.k0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> g
     1:1:java.lang.Object get(int):86:86 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.p.a.a.b.p0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.r.a.a.b.p0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     int size -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
@@ -9412,13 +9417,13 @@
     1:1:int size():493:493 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():67 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.p.a.a.b.m0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.r.a.a.b.m0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):595:595 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.p.a.a.b.n0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.r.a.a.b.n0:
     com.android.tools.r8.com.google.common.collect.Multimap builderMultimap -> a
     1:1:void <init>():156:156 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):159:160 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.p.a.a.b.o0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.r.a.a.b.o0:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):539:540 -> <init>
     1:1:boolean isPartialView():550:550 -> b
@@ -9432,7 +9437,7 @@
     1:1:int size():555:555 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():555 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.p.a.a.b.p0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.r.a.a.b.p0$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -9445,7 +9450,7 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):598 -> next
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):595 -> next
     7:7:java.lang.Object next():589 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.p.a.a.b.p0$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.r.a.a.b.p0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     boolean isPartialView() -> b
@@ -9467,7 +9472,7 @@
     1:1:int size():661:661 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():661 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.p.a.a.b.r0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.r.a.a.b.r0:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> c
     1:1:void <init>():235:235 -> <init>
@@ -9494,14 +9499,14 @@
     1:1:java.util.Iterator iterator():53:53 -> iterator
     2:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():239:240 -> iterator
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.p.a.a.b.q0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.r.a.a.b.q0:
     java.util.Iterator val$entryIterator -> c
     java.lang.Object element -> b
     int remaining -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):240:240 -> <init>
     1:1:boolean hasNext():246:246 -> hasNext
     1:7:java.lang.Object next():251:257 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.p.a.a.b.r0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.r.a.a.b.r0$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373:373 -> <init>
@@ -9511,9 +9516,9 @@
     1:1:java.lang.Object get(int):372 -> get
     1:1:int hashCode():404:404 -> hashCode
     1:1:int size():386:386 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.p.a.a.b.s0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.r.a.a.b.s0:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.p.a.a.b.t0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.r.a.a.b.t0:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     1:1:void <init>():332:332 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet access$000(int,java.lang.Object[]):51:51 -> a
@@ -9546,7 +9551,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> g
     1:1:int hashCode():354:354 -> hashCode
     1:1:java.util.stream.Collector toImmutableSet():65:65 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.p.a.a.b.t0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.r.a.a.b.t0$a:
     1:1:void <init>():471:471 -> <init>
     2:2:void <init>(int):475:475 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):464:464 -> a
@@ -9555,7 +9560,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> a
     6:9:com.android.tools.r8.com.google.common.collect.ImmutableSet build():555:558 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.p.a.a.b.v0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.r.a.a.b.v0:
     1:1:void <init>():376:376 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():400:400 -> d
     1:3:void forEach(java.util.function.Consumer):392:394 -> forEach
@@ -9566,13 +9571,13 @@
     1:1:java.util.Spliterator spliterator():386:386 -> spliterator
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     2:2:java.util.Spliterator spliterator():386 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.p.a.a.b.u0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.r.a.a.b.u0:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed delegateCollection():408:408 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> g
     1:1:java.lang.Object get(int):403:403 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.p.a.a.b.w0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.r.a.a.b.w0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):34:34 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.subListUnchecked(int,int):454:454 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):83 -> b
@@ -9592,7 +9597,7 @@
     1:1:java.util.Spliterator spliterator():90 -> spliterator
     2:3:java.util.Spliterator spliterator():92:93 -> spliterator
     4:4:java.util.Spliterator spliterator():89:89 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap -> com.android.tools.r8.p.a.a.b.A0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap -> com.android.tools.r8.r.a.a.b.A0:
     com.android.tools.r8.com.google.common.collect.ImmutableList valueList -> f
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap descendingMap -> g
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap NATURAL_EMPTY_MAP -> h
@@ -9780,13 +9785,13 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():694:694 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():694:694 -> values
     2:2:java.util.Collection values():62 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1 -> com.android.tools.r8.p.a.a.b.x0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1 -> com.android.tools.r8.r.a.a.b.x0:
     java.util.Comparator val$comparator -> a
     1:1:void <init>(java.util.Comparator):392:392 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):392:392 -> compare
     2:2:int compare(java.util.Map$Entry,java.util.Map$Entry):395:395 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):392 -> compare
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet -> com.android.tools.r8.p.a.a.b.z0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet -> com.android.tools.r8.r.a.a.b.z0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap):629:629 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():647:647 -> d
@@ -9796,7 +9801,7 @@
     2:2:java.util.Iterator iterator():628 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():669:669 -> j
     1:1:java.util.Spliterator spliterator():637:637 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.p.a.a.b.y0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.r.a.a.b.y0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet):647:647 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():662:662 -> g
@@ -9808,7 +9813,7 @@
     2:2:java.util.Spliterator spliterator():657:657 -> spliterator
     3:3:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     3:3:java.util.Spliterator spliterator():656 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$Builder -> com.android.tools.r8.p.a.a.b.A0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$Builder -> com.android.tools.r8.r.a.a.b.A0$a:
     java.util.Comparator comparator -> d
     1:2:void <init>(java.util.Comparator):475:476 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():467:467 -> a
@@ -9820,9 +9825,9 @@
     5:11:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():564:570 -> a
     12:12:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():568:568 -> a
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():566:566 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.p.a.a.b.B0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.r.a.a.b.B0:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.p.a.a.b.C0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.r.a.a.b.C0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> d
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
@@ -9901,7 +9906,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object,boolean):661 -> tailSet
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object):652 -> tailSet
     4:4:java.util.SortedSet tailSet(java.lang.Object):63 -> tailSet
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.p.a.a.b.C0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.r.a.a.b.C0$a:
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):462:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet build():455:455 -> a
@@ -9918,9 +9923,9 @@
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):531:531 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):455 -> a
     9:11:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():542:544 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.p.a.a.b.D0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.r.a.a.b.D0:
     1:1:void <init>():39:39 -> <init>
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.p.a.a.b.E0:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.r.a.a.b.E0:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> c
     java.lang.Iterable val$unfiltered -> b
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> <init>
@@ -9946,35 +9951,35 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):139 -> spliterator
     4:4:java.util.Spliterator spliterator():594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.p.a.a.b.F0:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.r.a.a.b.F0:
     java.util.Iterator val$iterator -> a
     1:1:void <init>(java.util.Iterator):137:137 -> <init>
     1:1:boolean hasNext():140:140 -> hasNext
     1:1:java.lang.Object next():145:145 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.p.a.a.b.G0:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.r.a.a.b.G0:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     1:2:void <init>(java.lang.Iterable):411:412 -> <init>
     1:1:boolean hasNext():425:425 -> hasNext
     1:7:java.lang.Object next():430:436 -> next
     1:1:void remove():441:441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.p.a.a.b.H0:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.r.a.a.b.H0:
     java.lang.Object[] val$elements -> b
     int index -> a
     1:2:void <init>(java.lang.Object[]):471:472 -> <init>
     1:1:boolean hasNext():476:476 -> hasNext
     1:6:java.lang.Object next():481:486 -> next
     7:7:java.lang.Object next():482:482 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.p.a.a.b.I0:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.r.a.a.b.I0:
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
     1:7:java.lang.Object computeNext():662:668 -> c
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.p.a.a.b.J0:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.r.a.a.b.J0:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):820:820 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.p.a.a.b.K0:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.r.a.a.b.K0:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -9983,21 +9988,21 @@
     1:5:java.lang.Object next():962:966 -> next
     6:6:java.lang.Object next():963:963 -> next
     1:1:void remove():971:971 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.p.a.a.b.L0:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.r.a.a.b.L0:
     java.lang.Object val$value -> b
     boolean done -> a
     1:1:void <init>(java.lang.Object):1104:1104 -> <init>
     1:1:boolean hasNext():1109:1109 -> hasNext
     1:5:java.lang.Object next():1114:1118 -> next
     6:6:java.lang.Object next():1115:1115 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.p.a.a.b.M0:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.r.a.a.b.M0:
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> e
     java.lang.Object[] array -> c
     int offset -> d
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.p.a.a.b.N0:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.r.a.a.b.N0:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -10011,16 +10016,16 @@
     12:38:boolean hasNext():1389:1415 -> hasNext
     1:5:java.lang.Object next():1423:1427 -> next
     1:3:void remove():1433:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.p.a.a.b.O0:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.r.a.a.b.O0:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void remove():112:112 -> remove
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.p.a.a.b.P0:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.p.a.a.b.Q0:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.r.a.a.b.P0:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.r.a.a.b.Q0:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.p.a.a.b.S0:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.r.a.a.b.S0:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:java.util.List getForwardList():859:859 -> a
@@ -10081,7 +10086,7 @@
     7:7:int reversePosition(int):870:870 -> subList
     7:7:java.util.List subList(int,int):912 -> subList
     8:8:java.util.List subList(int,int):912:912 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.p.a.a.b.R0:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.r.a.a.b.R0:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -10101,7 +10106,7 @@
     1:1:int previousIndex():970:970 -> previousIndex
     1:3:void remove():975:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.p.a.a.b.T0:
+com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.r.a.a.b.T0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength -> d
     boolean useCustomMap -> a
     int initialCapacity -> b
@@ -10123,7 +10128,7 @@
     2:6:com.android.tools.r8.com.google.common.collect.MapMaker setValueStrength(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength):253:257 -> g
     2:6:com.android.tools.r8.com.google.common.collect.MapMaker weakValues():239 -> g
     1:17:java.lang.String toString():290:306 -> toString
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.p.a.a.b.Y0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.r.a.a.b.Y0:
     java.util.Set keySet -> g
     java.util.Set entrySet -> i
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper entryHelper -> f
@@ -10245,11 +10250,11 @@
     127:127:java.lang.Object replace(java.lang.Object,java.lang.Object):2497 -> replace
     1:6:int size():2361:2366 -> size
     1:2:java.util.Collection values():2522:2523 -> values
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.p.a.a.b.U0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.r.a.a.b.U0:
     1:1:void <init>():1024:1024 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1024:1024 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> com.android.tools.r8.p.a.a.b.V0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> com.android.tools.r8.r.a.a.b.V0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> c
     java.lang.Object key -> a
     int hash -> b
@@ -10257,19 +10262,19 @@
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():378:378 -> b
     1:1:int getHash():373:373 -> c
     1:1:java.lang.Object getKey():368:368 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> com.android.tools.r8.p.a.a.b.W0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> com.android.tools.r8.r.a.a.b.W0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> b
     int hash -> a
     1:3:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):671:673 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():688:688 -> b
     1:1:int getHash():683:683 -> c
     1:1:java.lang.Object getKey():678:678 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> com.android.tools.r8.p.a.a.b.X0:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.p.a.a.b.Y0$a:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> com.android.tools.r8.r.a.a.b.X0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.r.a.a.b.Y0$a:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2711:2711 -> <init>
     1:1:java.util.Map$Entry next():2715:2715 -> next
     1:1:java.lang.Object next():2711 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> com.android.tools.r8.p.a.a.b.Y0$b:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> com.android.tools.r8.r.a.a.b.Y0$b:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2796:2796 -> <init>
     1:1:void clear():2840:2840 -> clear
@@ -10278,7 +10283,7 @@
     1:1:java.util.Iterator iterator():2800:2800 -> iterator
     1:6:boolean remove(java.lang.Object):2820:2825 -> remove
     1:1:int size():2830:2830 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> com.android.tools.r8.p.a.a.b.Y0$c:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> com.android.tools.r8.r.a.a.b.Y0$c:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry nextEntry -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment currentSegment -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> h
@@ -10306,21 +10311,21 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> remove
     3:3:void remove():2643 -> remove
     4:5:void remove():2643:2644 -> remove
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.p.a.a.b.Z0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.r.a.a.b.Z0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext() -> b
     int getHash() -> c
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.p.a.a.b.a1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.r.a.a.b.a1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry newEntry(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int) -> a
     void setValue(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.p.a.a.b.Y0$d:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.r.a.a.b.Y0$d:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2648:2648 -> <init>
     1:1:java.lang.Object next():2652:2652 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> next
     2:2:java.lang.Object next():2652 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> com.android.tools.r8.p.a.a.b.Y0$e:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> com.android.tools.r8.r.a.a.b.Y0$e:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2720:2720 -> <init>
     1:1:void clear():2749:2749 -> clear
@@ -10329,12 +10334,12 @@
     1:1:java.util.Iterator iterator():2724:2724 -> iterator
     1:1:boolean remove(java.lang.Object):2744:2744 -> remove
     1:1:int size():2729:2729 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.p.a.a.b.b1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.r.a.a.b.b1:
     1:1:void <init>():2844:2844 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):2844:2844 -> <init>
     1:1:java.lang.Object[] toArray():2850:2850 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2855:2855 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> com.android.tools.r8.p.a.a.b.c1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> com.android.tools.r8.r.a.a.b.c1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap map -> a
     java.util.concurrent.atomic.AtomicInteger readCount -> g
     int maxSegmentSize -> f
@@ -10421,27 +10426,27 @@
     1:6:void runLockedCleanup():2015:2020 -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
     1:5:void tryDrainReferenceQueues():1367:1371 -> g
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> com.android.tools.r8.p.a.a.b.f1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> com.android.tools.r8.r.a.a.b.f1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength STRONG -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength WEAK -> b
     1:8:void <clinit>():257:264 -> <clinit>
     1:1:void <init>(java.lang.String,int):256:256 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):256:256 -> <init>
     com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.p.a.a.b.d1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.r.a.a.b.d1:
     1:1:void <init>(java.lang.String,int):257:257 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():260:260 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.p.a.a.b.e1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.r.a.a.b.e1:
     1:1:void <init>(java.lang.String,int):264:264 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():267:267 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.p.a.a.b.h1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.r.a.a.b.h1:
     java.lang.Object value -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):411:411 -> <init>
     2:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):408:408 -> <init>
     1:1:void setValue(java.lang.Object):421:421 -> a
     2:4:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):425:427 -> a
     1:1:java.lang.Object getValue():417:417 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> com.android.tools.r8.p.a.a.b.g1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> com.android.tools.r8.r.a.a.b.g1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():435:435 -> <clinit>
     1:1:void <init>():432:432 -> <init>
@@ -10458,10 +10463,10 @@
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):459:459 -> a
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):432 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper instance():439:439 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.p.a.a.b.i1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.r.a.a.b.i1:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2035:2035 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> com.android.tools.r8.p.a.a.b.k1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> com.android.tools.r8.r.a.a.b.k1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):497:497 -> <init>
     2:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):494:494 -> <init>
@@ -10469,7 +10474,7 @@
     6:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):520:522 -> a
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():528:528 -> a
     1:1:java.lang.Object getValue():502:502 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> com.android.tools.r8.p.a.a.b.j1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> com.android.tools.r8.r.a.a.b.j1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():535:535 -> <clinit>
     1:1:void <init>():532:532 -> <init>
@@ -10486,7 +10491,7 @@
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):558:558 -> a
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):532 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper instance():539:539 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.p.a.a.b.l1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.r.a.a.b.l1:
     java.lang.ref.ReferenceQueue queueForValues -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2060:2060 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2053:2053 -> <init>
@@ -10494,12 +10499,12 @@
     1:1:void maybeClearReferenceQueues():2112:2112 -> b
     1:1:void maybeDrainReferenceQueues():2107:2107 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.p.a.a.b.Y0$f:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.r.a.a.b.Y0$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2656:2656 -> <init>
     1:1:java.lang.Object next():2660:2660 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getValue():2684:2684 -> next
     2:2:java.lang.Object next():2660 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> com.android.tools.r8.p.a.a.b.Y0$g:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> com.android.tools.r8.r.a.a.b.Y0$g:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2754:2754 -> <init>
     1:1:void clear():2778:2778 -> clear
@@ -10509,7 +10514,7 @@
     1:1:int size():2763:2763 -> size
     1:1:java.lang.Object[] toArray():2786:2786 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2791:2791 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.p.a.a.b.n1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.r.a.a.b.n1:
     java.lang.Object value -> c
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):780:780 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):776:776 -> <init>
@@ -10521,7 +10526,7 @@
     6:6:void setValue(java.lang.Object):790:790 -> a
     6:6:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):797 -> a
     1:1:java.lang.Object getValue():786:786 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.p.a.a.b.m1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.r.a.a.b.m1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():805:805 -> <clinit>
     1:1:void <init>():802:802 -> <init>
@@ -10541,7 +10546,7 @@
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):828:828 -> a
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):802 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper instance():809:809 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.p.a.a.b.o1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.r.a.a.b.o1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2149:2149 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2142:2142 -> <init>
@@ -10549,7 +10554,7 @@
     1:1:void maybeClearReferenceQueues():2175:2175 -> b
     1:1:void maybeDrainReferenceQueues():2170:2170 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.p.a.a.b.q1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.r.a.a.b.q1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> c
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):869:869 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):865:865 -> <init>
@@ -10560,7 +10565,7 @@
     5:9:void setValue(java.lang.Object,java.lang.ref.ReferenceQueue):893:897 -> a
     10:10:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():902:902 -> a
     1:1:java.lang.Object getValue():874:874 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.p.a.a.b.p1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.r.a.a.b.p1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():909:909 -> <clinit>
     1:1:void <init>():906:906 -> <init>
@@ -10580,7 +10585,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):931:931 -> a
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):906 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper instance():913:913 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.p.a.a.b.r1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.r.a.a.b.r1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     java.lang.ref.ReferenceQueue queueForValues -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -10590,17 +10595,17 @@
     2:2:void maybeClearReferenceQueues():2247:2247 -> b
     1:2:void maybeDrainReferenceQueues():2241:2242 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.p.a.a.b.s1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.r.a.a.b.s1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.p.a.a.b.t1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.r.a.a.b.t1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.p.a.a.b.u1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.r.a.a.b.u1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry entry -> a
     1:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1051:1052 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry():1057:1057 -> a
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1062:1062 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> com.android.tools.r8.p.a.a.b.Y0$h:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> com.android.tools.r8.r.a.a.b.Y0$h:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Object key -> a
@@ -10610,13 +10615,13 @@
     1:1:java.lang.Object getValue():2684:2684 -> getValue
     1:1:int hashCode():2700:2700 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):2705:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.p.a.a.b.v1:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.p.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.r.a.a.b.v1:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.r.a.a.b.w1:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(java.util.Map$Entry):1447:1447 -> <init>
     1:1:java.lang.Object getKey():1450:1450 -> getKey
     1:1:java.lang.Object getValue():1455:1455 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.p.a.a.b.x1:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.r.a.a.b.x1:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -10629,23 +10634,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1446 -> next
     3:3:java.util.Map$Entry next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.p.a.a.b.A1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.r.a.a.b.A1:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> a
     1:8:void <clinit>():93:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):92:92 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.p.a.a.b.y1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.r.a.a.b.y1:
     1:1:void <init>(java.lang.String,int):93:93 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):93:93 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):97:97 -> apply
     2:2:java.lang.Object apply(java.lang.Object):93 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.p.a.a.b.z1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.r.a.a.b.z1:
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):100:100 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):104:104 -> apply
     2:2:java.lang.Object apply(java.lang.Object):100 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.p.a.a.b.B1:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.r.a.a.b.B1:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -10665,11 +10670,11 @@
     4:4:boolean retainAll(java.util.Collection):4166 -> retainAll
     5:11:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.p.a.a.b.D1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.r.a.a.b.D1:
     1:1:void <init>():3653:3653 -> <init>
     java.util.Iterator entryIterator() -> c
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.p.a.a.b.C1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.r.a.a.b.C1:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3666:3666 -> <init>
     1:1:java.util.Map map():3669:3669 -> a
@@ -10682,7 +10687,7 @@
     2:2:java.util.Spliterator spliterator():3679 -> spliterator
     3:3:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.entrySpliterator():3660:3660 -> spliterator
     3:3:java.util.Spliterator spliterator():3679 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.p.a.a.b.E1:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.r.a.a.b.E1:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):3839:3840 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3856:3856 -> a
@@ -10718,7 +10723,7 @@
     1:1:java.util.Map map():3844:3844 -> size
     1:1:int size():3861 -> size
     2:2:int size():3861:3861 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.p.a.a.b.F1:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.r.a.a.b.F1:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):4026:4027 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):4043:4043 -> a
@@ -10775,7 +10780,7 @@
     1:1:java.util.Map map():4031:4031 -> size
     1:1:int size():4093 -> size
     2:2:int size():4093:4093 -> size
-com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.p.a.a.b.G1:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.r.a.a.b.G1:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -10787,31 +10792,31 @@
     2:2:java.util.Collection createValues():3649:3649 -> values
     2:2:java.util.Collection values():3645 -> values
     3:3:java.util.Collection values():3645:3645 -> values
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.p.a.a.b.H1:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.r.a.a.b.H1:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
     java.util.Collection entries() -> a
     java.util.Map asMap() -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.p.a.a.b.I1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.r.a.a.b.I1:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.p.a.a.b.J1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.r.a.a.b.J1:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List get():199:199 -> get
     1:1:java.lang.Object get():190 -> get
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.p.a.a.b.K1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.r.a.a.b.K1:
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>():77:77 -> <init>
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$1):71 -> <init>
     1:1:void <init>():438 -> <init>
     com.android.tools.r8.com.google.common.collect.ListMultimap build() -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys(int):126:127 -> b
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys():113 -> b
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.p.a.a.b.M1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.r.a.a.b.M1:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues(int):300:301 -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues():290 -> a
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.p.a.a.b.L1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.r.a.a.b.L1:
     com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys this$0 -> b
     int val$expectedValuesPerKey -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys,int):301:301 -> <init>
@@ -10824,12 +10829,12 @@
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap build():305:305 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.newListMultimap(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):294:294 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap build():304 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.p.a.a.b.N1:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.r.a.a.b.N1:
     com.android.tools.r8.com.google.common.base.Supplier factory -> g
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     1:1:java.util.List createCollection():307:307 -> j
     1:1:java.util.Collection createCollection():297 -> j
-com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.p.a.a.b.O1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.r.a.a.b.O1:
     1:1:void <init>():1793:1793 -> <init>
     1:1:void clear():1821:1821 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> clear
@@ -10847,7 +10852,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> size
     2:2:int size():1798 -> size
     3:3:int size():1798:1798 -> size
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.p.a.a.b.R1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.r.a.a.b.R1:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1678:1678 -> a
@@ -10870,17 +10875,17 @@
     3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> iterator
     3:3:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.p.a.a.b.Q1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.r.a.a.b.Q1:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1652:1652 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1652:1652 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry transform(java.util.Map$Entry):1655:1655 -> a
     2:2:java.lang.Object transform(java.lang.Object):1652 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.p.a.a.b.P1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.r.a.a.b.P1:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
     1:1:int getCount():1663:1663 -> a
     1:1:java.lang.Object getElement():1658:1658 -> b
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.p.a.a.b.R1$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.r.a.a.b.R1$a:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> a
@@ -10893,7 +10898,7 @@
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.p.a.a.b.S1:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.r.a.a.b.S1:
     int remove(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:4:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):494:497 -> a
@@ -10905,22 +10910,22 @@
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     java.util.Set elementSet() -> h
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.p.a.a.b.S1$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.r.a.a.b.S1$a:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.p.a.a.b.T1:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.r.a.a.b.T1:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
     1:2:int hashCode():854:855 -> hashCode
     1:3:java.lang.String toString():867:869 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.p.a.a.b.U1:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.r.a.a.b.U1:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> a
     1:1:void <clinit>():1165:1165 -> <clinit>
     1:1:void <init>():1164:1164 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1164:1164 -> compare
     2:2:int compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1168:1168 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1164 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.p.a.a.b.W1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.r.a.a.b.W1:
     1:1:void <init>():977:977 -> <init>
     1:1:void clear():982:982 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> clear
@@ -10950,25 +10955,25 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> size
     2:2:int size():1017 -> size
     3:3:int size():1017:1017 -> size
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.p.a.a.b.V1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.r.a.a.b.V1:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ElementSet,java.util.Iterator):1002:1002 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1002:1002 -> a
     2:2:java.lang.Object transform(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1005:1005 -> a
     2:2:java.lang.Object transform(java.lang.Object):1002 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.p.a.a.b.X1:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.r.a.a.b.X1:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.p.a.a.b.Y1:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.r.a.a.b.Y1:
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
     1:1:int getCount():272:272 -> a
     1:1:java.lang.Object getElement():267:267 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.p.a.a.b.Z1:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.r.a.a.b.Z1:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -10982,11 +10987,11 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):35 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.p.a.a.b.a2:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.r.a.a.b.a2:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering reverse():404:404 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.p.a.a.b.b2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.r.a.a.b.b2:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> c
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -10998,7 +11003,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.p.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.r.a.a.b.e2:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> j
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> e
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap EMPTY -> k
@@ -11044,8 +11049,8 @@
     boolean isHashCodeFast() -> k
     boolean isPartialView() -> l
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.p.a.a.b.c2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.p.a.a.b.e2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.r.a.a.b.c2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.r.a.a.b.e2$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):195:195 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):195:195 -> <init>
@@ -11069,7 +11074,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.p.a.a.b.e2$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.r.a.a.b.e2$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():268:268 -> d
@@ -11080,7 +11085,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     2:2:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.p.a.a.b.d2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.r.a.a.b.d2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> g
@@ -11089,7 +11094,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> get
     3:3:java.util.Map$Entry get(int):272 -> get
     3:3:java.lang.Object get(int):268 -> get
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.p.a.a.b.f2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.r.a.a.b.f2:
     java.lang.Object[] array -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11102,7 +11107,7 @@
     2:2:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.p.a.a.b.i2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.r.a.a.b.i2:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> f
     java.util.Map$Entry[] entries -> e
@@ -11146,7 +11151,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> j
     boolean isPartialView() -> l
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.p.a.a.b.g2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.r.a.a.b.g2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11155,13 +11160,13 @@
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.p.a.a.b.h2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.r.a.a.b.h2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.p.a.a.b.k2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.r.a.a.b.k2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -11180,8 +11185,8 @@
     3:4:java.util.Set elementSet():34 -> h
     1:1:int hashCode():175:175 -> hashCode
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.p.a.a.b.j2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.p.a.a.b.k2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.r.a.a.b.j2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.r.a.a.b.k2$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11191,11 +11196,11 @@
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.p.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.r.a.a.b.l2:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.p.a.a.b.m2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.r.a.a.b.m2:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
     java.lang.Object[] elements -> c
@@ -11216,7 +11221,7 @@
     2:2:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.p.a.a.b.n2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.r.a.a.b.n2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -11321,7 +11326,7 @@
     1:2:java.lang.Object lower(java.lang.Object):212:213 -> lower
     1:1:int size():77:77 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.p.a.a.b.o2:
+com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.r.a.a.b.o2:
     com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering INSTANCE -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():98:98 -> <init>
@@ -11333,7 +11338,7 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     3:3:int compare(java.lang.Comparable,java.lang.Comparable):33 -> compare
     3:3:int compare(java.lang.Object,java.lang.Object):26 -> compare
-com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.p.a.a.b.p2:
+com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.r.a.a.b.p2:
     com.android.tools.r8.com.google.common.collect.Ordering forwardOrder -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Ordering):31:32 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():43:43 -> a
@@ -11341,7 +11346,7 @@
     1:3:boolean equals(java.lang.Object):98:100 -> equals
     1:1:int hashCode():90:90 -> hashCode
     1:1:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.p.a.a.b.r2:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.r.a.a.b.r2:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -11353,13 +11358,13 @@
     1:1:java.util.stream.Stream parallelStream():790:790 -> parallelStream
     1:3:int size():747:749 -> size
     1:1:java.util.stream.Stream stream():785:785 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.p.a.a.b.q2:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.r.a.a.b.q2:
     java.util.Iterator itr2 -> d
     java.util.Iterator itr1 -> c
     com.android.tools.r8.com.google.common.collect.Sets$1 this$0 -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):763:765 -> <init>
     1:10:java.lang.Object computeNext():769:778 -> c
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.p.a.a.b.t2:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.r.a.a.b.t2:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -11371,12 +11376,12 @@
     1:1:java.util.stream.Stream parallelStream():868:868 -> parallelStream
     1:2:int size():874:875 -> size
     1:1:java.util.stream.Stream stream():863:863 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.p.a.a.b.s2:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.r.a.a.b.s2:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
     1:7:java.lang.Object computeNext():850:856 -> c
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.p.a.a.b.v2:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.r.a.a.b.v2:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):914:914 -> <init>
@@ -11389,12 +11394,12 @@
     1:1:java.util.stream.Stream parallelStream():939:939 -> parallelStream
     1:2:int size():945:946 -> size
     1:1:java.util.stream.Stream stream():934:934 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.p.a.a.b.u2:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.r.a.a.b.u2:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
     1:7:java.lang.Object computeNext():921:927 -> c
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.p.a.a.b.z2:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.r.a.a.b.z2:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> b
     int val$size -> a
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1676:1676 -> <init>
@@ -11402,31 +11407,31 @@
     1:1:java.util.Iterator iterator():1688:1688 -> iterator
     1:1:int size():1755:1755 -> size
     1:1:java.lang.String toString():1760:1760 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.p.a.a.b.y2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.r.a.a.b.y2:
     java.util.BitSet bits -> c
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1688:1689 -> <init>
     1:29:java.util.Set computeNext():1693:1721 -> c
     1:29:java.lang.Object computeNext():1688 -> c
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.p.a.a.b.x2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.r.a.a.b.x2:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> b
     java.util.BitSet val$copy -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1721:1721 -> <init>
     1:2:boolean contains(java.lang.Object):1724:1725 -> contains
     1:1:java.util.Iterator iterator():1730:1730 -> iterator
     1:1:int size():1746:1746 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.p.a.a.b.w2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.r.a.a.b.w2:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> d
     int i -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1730:1731 -> <init>
     1:5:java.lang.Object computeNext():1735:1739 -> c
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.p.a.a.b.A2:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.r.a.a.b.A2:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:boolean retainAll(java.util.Collection):85:85 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.p.a.a.b.B2:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.r.a.a.b.B2:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):599:599 -> <init>
     2:2:void <init>():600:600 -> <init>
     1:1:boolean add(java.lang.Object):640:640 -> add
@@ -11436,7 +11441,7 @@
     1:1:boolean removeAll(java.util.Collection):679:679 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):692:692 -> removeIf
     1:1:boolean retainAll(java.util.Collection):705:705 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.p.a.a.b.C2:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.r.a.a.b.C2:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -11464,7 +11469,7 @@
     1:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1911 -> subSet
     3:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.p.a.a.b.D2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.r.a.a.b.D2:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -11485,7 +11490,7 @@
     1:1:java.lang.Object get(java.lang.Object):55:55 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> h
     boolean isPartialView() -> l
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.p.a.a.b.E2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.r.a.a.b.E2:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11500,7 +11505,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> subList
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.p.a.a.b.F2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.r.a.a.b.F2:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11516,22 +11521,22 @@
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.p.a.a.b.G2:
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.p.a.a.b.H2:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.r.a.a.b.G2:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.r.a.a.b.H2:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):369:370 -> <init>
     1:1:void accept(java.lang.Object):375:375 -> accept
     1:6:boolean tryAdvance(java.util.function.Consumer):380:385 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.p.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.r.a.a.b.I2:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):352:353 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):357:358 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.p.a.a.b.J2:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.r.a.a.b.J2:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.p.a.a.b.K2:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.r.a.a.b.K2:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11545,33 +11550,33 @@
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator trySplit():434:434 -> trySplit
     7:7:java.util.Spliterator trySplit():413 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.p.a.a.b.L2:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.r.a.a.b.L2:
     java.util.Iterator backingIterator -> a
     1:2:void <init>(java.util.Iterator):35:36 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():43:43 -> hasNext
     1:1:java.lang.Object next():48:48 -> next
     1:1:void remove():53:53 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.p.a.a.b.M2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.r.a.a.b.M2:
     1:1:void <init>():35:35 -> <init>
     1:1:void remove():46:46 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.p.a.a.b.N2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.r.a.a.b.N2:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):44:44 -> add
     1:1:void set(java.lang.Object):56:56 -> set
-com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.p.a.a.c.a:
+com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.r.a.a.c.a:
     1:1:void <init>():28:28 -> <init>
     1:1:com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset):42:42 -> a
     2:2:com.android.tools.r8.com.google.common.hash.HashCode hashBytes(byte[],int,int):62:62 -> a
     3:5:com.android.tools.r8.com.google.common.hash.Hasher newHasher(int):73:75 -> a
     3:5:com.android.tools.r8.com.google.common.hash.HashCode hashBytes(byte[],int,int):63 -> a
     6:6:com.android.tools.r8.com.google.common.hash.HashCode hashBytes(byte[],int,int):63:63 -> a
-com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.p.a.a.c.b:
+com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.r.a.a.c.b:
     1:1:void <init>():29:29 -> <init>
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int) -> a
     1:1:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     2:2:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):60:60 -> a
-com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.p.a.a.c.e:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.r.a.a.c.e:
     char[] hexDigits -> a
     1:1:void <clinit>():429:429 -> <clinit>
     1:1:void <init>():38:38 -> <init>
@@ -11585,7 +11590,7 @@
     1:3:boolean equals(java.lang.Object):380:382 -> equals
     1:8:int hashCode():396:403 -> hashCode
     1:6:java.lang.String toString():421:426 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.p.a.a.c.c:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.r.a.a.c.c:
     byte[] bytes -> b
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -11593,30 +11598,30 @@
     1:5:int asInt():278:282 -> b
     1:1:int bits():268:268 -> c
     1:1:byte[] getBytesInternal():313:313 -> d
-com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.p.a.a.c.d:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.r.a.a.c.d:
     int hash -> b
     1:2:void <init>(int):125:126 -> <init>
     1:1:byte[] asBytes():136:136 -> a
     2:2:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):168:168 -> a
     1:1:int asInt():146:146 -> b
     int bits() -> c
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.p.a.a.c.f:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.r.a.a.c.f:
     com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset) -> a
     com.android.tools.r8.com.google.common.hash.Hasher newHasher() -> a
-com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.p.a.a.c.g:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.r.a.a.c.g:
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset) -> a
-com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.p.a.a.c.i:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.r.a.a.c.i:
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_32():111:111 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():200:200 -> b
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.p.a.a.c.h:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.r.a.a.c.h:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():204:204 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.p.a.a.c.l:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.r.a.a.c.l:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -11631,8 +11636,8 @@
     15:15:java.security.MessageDigest getMessageDigest(java.lang.String):79:79 -> a
     15:15:com.android.tools.r8.com.google.common.hash.Hasher newHasher():92 -> a
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.p.a.a.c.j:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.p.a.a.c.k:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.r.a.a.c.j:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.r.a.a.c.k:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -11665,7 +11670,7 @@
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):459:459 -> b
     6:6:void checkNotDone():149 -> b
     6:6:void update(byte[],int,int):138 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.p.a.a.c.n:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.r.a.a.c.n:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_32 -> b
     int seed -> a
     1:3:void <clinit>():53:55 -> <clinit>
@@ -11696,7 +11701,7 @@
     1:3:boolean equals(java.lang.Object):86:88 -> equals
     1:1:int hashCode():95:95 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.p.a.a.c.m:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.r.a.a.c.m:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -11716,7 +11721,7 @@
     52:52: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):55:55 -> a
     52:52:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):378 -> a
     53:56:com.android.tools.r8.com.google.common.hash.HashCode hash():384:387 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.p.a.a.d.e:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.r.a.a.d.e:
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
     1:45:void <clinit>():315:359 -> <clinit>
     46:46:void com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding.<init>(java.lang.String,java.lang.String,java.lang.Character):563:563 -> <clinit>
@@ -11739,7 +11744,7 @@
     12:12:java.lang.String encode(byte[],int,int):157:157 -> a
     12:12:java.lang.String encode(byte[]):144 -> a
     1:1:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():355:355 -> b
-com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.p.a.a.d.a:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.r.a.a.d.a:
     char[] chars -> b
     int bytesPerChunk -> f
     byte[] decodabet -> g
@@ -11756,19 +11761,19 @@
     1:3:boolean equals(java.lang.Object):543:545 -> equals
     1:1:int hashCode():552:552 -> hashCode
     1:1:java.lang.String toString():538:538 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.p.a.a.d.b:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.r.a.a.d.b:
     char[] encoding -> d
     1:1:void <init>(java.lang.String,java.lang.String):847:847 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):851:851 -> <init>
     3:14:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):844:855 -> <init>
     1:5:void encodeTo(java.lang.Appendable,byte[],int,int):862:866 -> a
     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):886:886 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.p.a.a.d.c:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.r.a.a.d.c:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.Character):892:892 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):896:897 -> <init>
     1:11:void encodeTo(java.lang.Appendable,byte[],int,int):903:913 -> a
     12:12:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):943:943 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.p.a.a.d.d:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.r.a.a.d.d:
     java.lang.Character paddingChar -> c
     com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet alphabet -> b
     1:4:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):566:569 -> <init>
@@ -11783,7 +11788,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():839 -> hashCode
     1:10:java.lang.String toString():815:824 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.p.a.a.d.g:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.r.a.a.d.g:
     java.io.OutputStream NULL_OUTPUT_STREAM -> a
     1:1:void <clinit>():594:594 -> <clinit>
     1:1:byte[] createBuffer():56:56 -> a
@@ -11793,13 +11798,13 @@
     7:7:long copy(java.io.InputStream,java.io.OutputStream):101 -> a
     8:10:byte[] toByteArray(java.io.InputStream):165:167 -> a
     11:11:java.io.OutputStream nullOutputStream():624:624 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.p.a.a.d.f:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.r.a.a.d.f:
     1:1:void <init>():595:595 -> <init>
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.p.a.a.d.h:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.r.a.a.d.h:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -11817,11 +11822,11 @@
     1:1:boolean ready():106:106 -> ready
     1:2:void reset():124:125 -> reset
     1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.p.a.a.d.k:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.r.a.a.d.k:
     1:1:void <init>():76:76 -> <init>
     java.io.Reader openStream() -> a
     1:1:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.p.a.a.d.i:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.r.a.a.d.i:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():525:525 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
@@ -11833,13 +11838,13 @@
     22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toString
     22:22:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):546 -> toString
     22:22:java.lang.String toString():609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.p.a.a.d.j:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.r.a.a.d.j:
     1:1:void <init>(java.lang.String):630:630 -> <init>
     1:1:java.io.Reader openStream():635:635 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.p.a.a.d.l:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.r.a.a.d.l:
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.p.a.a.d.p:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.r.a.a.d.p:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
     java.util.Deque stack -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> c
@@ -11851,12 +11856,12 @@
     1:1:com.android.tools.r8.com.google.common.io.Closer create():104:104 -> a
     2:2:java.io.Closeable register(java.io.Closeable):128:128 -> a
     1:16:void close():213:228 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.p.a.a.d.m:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.r.a.a.d.m:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.p.a.a.d.n:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.r.a.a.d.n:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -11867,9 +11872,9 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.p.a.a.d.o:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.r.a.a.d.o:
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
-com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.p.a.a.e.b:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.r.a.a.e.b:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -11889,12 +11894,12 @@
     89:89:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     89:89:int divide(int,int,java.math.RoundingMode):318 -> a
     90:108:int binomial(int,int):649:667 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.p.a.a.e.a:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.r.a.a.e.a:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():121:121 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.p.a.a.e.c:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.r.a.a.e.c:
     1:1:int checkNonNegative(java.lang.String,int):53:53 -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.p.a.b.a:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.r.a.b.a:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:3:void add(com.android.tools.r8.com.google.gson.JsonElement):95:97 -> a
@@ -11906,7 +11911,7 @@
     1:1:int hashCode():371:371 -> hashCode
     1:1:java.util.Iterator iterator():171:171 -> iterator
     1:1:int size():161:161 -> size
-com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.p.a.b.b:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.r.a.b.b:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -11922,15 +11927,15 @@
     4:4: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):72:72 -> toString
     4:4:java.lang.String toString():324 -> toString
     5:7:java.lang.String toString():325:327 -> toString
-com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.p.a.b.c:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.r.a.b.c:
     1:1:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.p.a.b.d:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.r.a.b.d:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:boolean equals(java.lang.Object):61:61 -> equals
     1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.p.a.b.e:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.r.a.b.e:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> a
     1:2:void <init>():32:33 -> <init>
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
@@ -11950,11 +11955,11 @@
     1:1:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.p.a.b.f:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.r.a.b.f:
     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>
-com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.p.a.b.g:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.r.a.b.g:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):45:45 -> a
     2:3:com.android.tools.r8.com.google.gson.JsonElement parse(java.io.Reader):58:59 -> a
@@ -11976,7 +11981,7 @@
     11:20:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     21:21:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     22:26:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):86:90 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.p.a.b.h:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.r.a.b.h:
     java.lang.Class[] PRIMITIVE_TYPES -> b
     java.lang.Object value -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12015,20 +12020,20 @@
     1:1:java.lang.Number getAsNumber():157:157 -> i
     1:1:boolean isBoolean():112:112 -> j
     1:1:boolean isNumber():146:146 -> k
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.p.a.b.i:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.r.a.b.i:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.p.a.b.k:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.r.a.b.k:
     1:1:void <init>():119:119 -> <init>
     java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter nullSafe():186:186 -> a
-com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.p.a.b.j:
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.r.a.b.j:
     com.android.tools.r8.com.google.gson.TypeAdapter this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):186:186 -> <init>
     1:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):189:191 -> a
     4:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):195:199 -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.p.a.b.l.a:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.r.a.b.l.a:
     java.lang.String value -> a
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -12038,7 +12043,7 @@
     1:6:int intValue():37:42 -> intValue
     1:3:long longValue():50:52 -> longValue
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.p.a.b.l.d:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.r.a.b.l.d:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> e
     java.util.Comparator NATURAL_ORDER -> h
     boolean $assertionsDisabled -> i
@@ -12081,12 +12086,12 @@
     1:3:java.lang.Object remove(java.lang.Object):111 -> remove
     4:4:java.lang.Object remove(java.lang.Object):112:112 -> remove
     1:1:int size():78:78 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.p.a.b.l.b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.r.a.b.l.b:
     1:1:void <init>():40:40 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):40:40 -> compare
     2:2:int compare(java.lang.Comparable,java.lang.Comparable):42:42 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):40 -> compare
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.p.a.b.l.d$a:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.r.a.b.l.d$a:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -12094,11 +12099,11 @@
     1:1:java.util.Iterator iterator():566:566 -> iterator
     1:9:boolean remove(java.lang.Object):578:586 -> remove
     1:1:int size():562:562 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.p.a.b.l.c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.r.a.b.l.c:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:1:java.util.Map$Entry next():568:568 -> next
     1:1:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.p.a.b.l.d$b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.r.a.b.l.d$b:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -12110,10 +12115,10 @@
     2:4:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):277:279 -> remove
     2:4:boolean remove(java.lang.Object):613 -> remove
     1:1:int size():597:597 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.p.a.b.l.e:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.r.a.b.l.e:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:1:java.lang.Object next():603:603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.p.a.b.l.d$c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.r.a.b.l.d$c:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> a
@@ -12126,7 +12131,7 @@
     1:1:boolean hasNext():535:535 -> hasNext
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.p.a.b.l.f:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.r.a.b.l.f:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> e
@@ -12143,7 +12148,7 @@
     1:2:int hashCode():491:492 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):475:476 -> setValue
     1:1:java.lang.String toString():496:496 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.p.a.b.l.g.w:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.r.a.b.l.g.w:
     com.android.tools.r8.com.google.gson.TypeAdapter STRING -> l
     com.android.tools.r8.com.google.gson.TypeAdapter STRING_BUILDER -> m
     com.android.tools.r8.com.google.gson.TypeAdapter NUMBER -> j
@@ -12167,21 +12172,21 @@
     com.android.tools.r8.com.google.gson.TypeAdapter CURRENCY -> s
     com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> v
     1:646:void <clinit>():69:714 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.p.a.b.l.g.f:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.r.a.b.l.g.f:
     1:1:void <init>():69:69 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69:69 -> a
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Class):73:76 -> a
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69 -> a
     6:10:java.lang.Class read(com.android.tools.r8.com.google.gson.stream.JsonReader):81:85 -> a
     6:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.p.a.b.l.g.a:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.r.a.b.l.g.a:
     1:1:void <init>():282:282 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282:282 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicIntegerArray):303:307 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282 -> a
     7:21:java.util.concurrent.atomic.AtomicIntegerArray read(com.android.tools.r8.com.google.gson.stream.JsonReader):284:298 -> a
     7:21:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):282 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.p.a.b.l.g.b:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.r.a.b.l.g.b:
     1:1:void <init>():362:362 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):362:362 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):378:378 -> a
@@ -12190,7 +12195,7 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
     12:12:java.lang.Number read(com.android.tools.r8.com.google.gson.stream.JsonReader):371:371 -> a
     12:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.p.a.b.l.g.c:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.r.a.b.l.g.c:
     1:1:void <init>():384:384 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):384:384 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Character):399:399 -> a
@@ -12199,21 +12204,21 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
     12:12:java.lang.Character read(com.android.tools.r8.com.google.gson.stream.JsonReader):393:393 -> a
     12:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.p.a.b.l.g.d:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.r.a.b.l.g.d:
     1:1:void <init>():406:406 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406:406 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.String):422:422 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406 -> a
     3:12:java.lang.String read(com.android.tools.r8.com.google.gson.stream.JsonReader):409:418 -> a
     3:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):406 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.p.a.b.l.g.e:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.r.a.b.l.g.e:
     1:1:void <init>():464:464 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464:464 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuilder):475:475 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464 -> a
     3:7:java.lang.StringBuilder read(com.android.tools.r8.com.google.gson.stream.JsonReader):467:471 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):464 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.p.a.b.l.g.p:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.r.a.b.l.g.p:
     1:1:void <init>():92:92 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):92:92 -> a
     2:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.BitSet):136:145 -> a
@@ -12226,63 +12231,63 @@
     42:63:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
     64:77:java.util.BitSet read(com.android.tools.r8.com.google.gson.stream.JsonReader):117:130 -> a
     64:77:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.p.a.b.l.g.g:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.r.a.b.l.g.g:
     1:1:void <init>():482:482 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482:482 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuffer):493:493 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482 -> a
     3:7:java.lang.StringBuffer read(com.android.tools.r8.com.google.gson.stream.JsonReader):485:489 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):482 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.p.a.b.l.g.h:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.r.a.b.l.g.h:
     1:1:void <init>():500:500 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500:500 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URL):512:512 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500 -> a
     3:8:java.net.URL read(com.android.tools.r8.com.google.gson.stream.JsonReader):503:508 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):500 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.p.a.b.l.g.i:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.r.a.b.l.g.i:
     1:1:void <init>():518:518 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518:518 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URI):534:534 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518 -> a
     3:11:java.net.URI read(com.android.tools.r8.com.google.gson.stream.JsonReader):521:529 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):518 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.p.a.b.l.g.j:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.r.a.b.l.g.j:
     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
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.InetAddress):552:552 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540 -> a
     3:8:java.net.InetAddress read(com.android.tools.r8.com.google.gson.stream.JsonReader):543:548 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):540 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.p.a.b.l.g.k:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.r.a.b.l.g.k:
     1:1:void <init>():559:559 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559:559 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.UUID):570:570 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559 -> a
     3:7:java.util.UUID read(com.android.tools.r8.com.google.gson.stream.JsonReader):562:566 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):559 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.p.a.b.l.g.l:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.r.a.b.l.g.l:
     1:1:void <init>():576:576 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576:576 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Currency):583:583 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576 -> a
     3:3:java.util.Currency read(com.android.tools.r8.com.google.gson.stream.JsonReader):579:579 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):576 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.p.a.b.l.g.m:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.r.a.b.l.g.m:
     1:1:void <init>():609:609 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609:609 -> a
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Calendar):654:670 -> a
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609 -> a
     19:48:java.util.Calendar read(com.android.tools.r8.com.google.gson.stream.JsonReader):619:648 -> a
     19:48:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):609 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.p.a.b.l.g.n:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.r.a.b.l.g.n:
     1:1:void <init>():677:677 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677:677 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Locale):708:708 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677 -> a
     3:26:java.util.Locale read(com.android.tools.r8.com.google.gson.stream.JsonReader):680:703 -> a
     3:26:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):677 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.p.a.b.l.g.o:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.r.a.b.l.g.o:
     1:1:void <init>():714:714 -> <init>
     1:1:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonNull():74:74 -> a
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):753 -> a
@@ -12308,49 +12313,49 @@
     66:67:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> a
     68:91:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> a
     92:97:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.p.a.b.l.g.q:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.r.a.b.l.g.q:
     1:1:void <init>():151:151 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151:151 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):165:165 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151 -> a
     3:10:java.lang.Boolean read(com.android.tools.r8.com.google.gson.stream.JsonReader):154:161 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):151 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.p.a.b.l.g.r:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.r.a.b.l.g.r:
     1:1:void <init>():190:190 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190:190 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):206:206 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190 -> a
     3:11:java.lang.Number read(com.android.tools.r8.com.google.gson.stream.JsonReader):193:201 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):190 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.p.a.b.l.g.s:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.r.a.b.l.g.s:
     1:1:void <init>():213:213 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213:213 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):228:228 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213 -> a
     3:10:java.lang.Number read(com.android.tools.r8.com.google.gson.stream.JsonReader):216:223 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):213 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.p.a.b.l.g.t:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.r.a.b.l.g.t:
     1:1:void <init>():235:235 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235:235 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):250:250 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235 -> a
     3:10:java.lang.Number read(com.android.tools.r8.com.google.gson.stream.JsonReader):238:245 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):235 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.p.a.b.l.g.u:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.r.a.b.l.g.u:
     1:1:void <init>():256:256 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256:256 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicInteger):265:265 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256 -> a
     3:5:java.util.concurrent.atomic.AtomicInteger read(com.android.tools.r8.com.google.gson.stream.JsonReader):259:261 -> a
     3:5:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):256 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.p.a.b.l.g.v:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.r.a.b.l.g.v:
     1:1:void <init>():271:271 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271:271 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicBoolean):276:276 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271 -> a
     3:3:java.util.concurrent.atomic.AtomicBoolean read(com.android.tools.r8.com.google.gson.stream.JsonReader):273:273 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):271 -> a
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.p.a.b.m.a:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.r.a.b.m.a:
     long peekedLong -> i
     char[] buffer -> c
     int stackSize -> m
@@ -12452,7 +12457,7 @@
     1:52:java.lang.String nextUnquotedValue():1032:1083 -> p
     1:5:void skipToEndOfLine():1411:1415 -> q
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.p.a.b.m.b:
+com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.r.a.b.m.b:
     com.android.tools.r8.com.google.gson.stream.JsonToken END_ARRAY -> b
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_OBJECT -> c
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_ARRAY -> a
@@ -12467,7 +12472,7 @@
     1:54:void <clinit>():31:84 -> <clinit>
     55:55:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.p.a.b.m.c:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.r.a.b.m.c:
     java.lang.String deferredName -> f
     java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> i
     int[] stack -> b
@@ -12520,7 +12525,7 @@
     10:11:void writeDeferredName():402:403 -> h
     12:12:void beforeName():616:616 -> h
     12:12:void writeDeferredName():401 -> h
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.p.a.b.m.d:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.r.a.b.m.d:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatdexbuilder.CompatDexBuilder -> com.android.tools.r8.compatdexbuilder.CompatDexBuilder:
     java.lang.String input -> a
@@ -12847,80 +12852,80 @@
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):146:146 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):165:176 -> <init>
     1:2:void encodeChecksums(java.lang.Iterable):206:207 -> a
-    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.<init>(int):110:110 -> a
+    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.<init>(int):110:110 -> a
     3:3:void encodeChecksums(java.lang.Iterable):207 -> a
     4:4:void encodeChecksums(java.lang.Iterable):208:208 -> a
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     5:5:void encodeChecksums(java.lang.Iterable):209 -> a
-    6:13:void encodeChecksums(java.lang.Iterable):209:216 -> a
-    14:44:void write(java.util.concurrent.ExecutorService):221:251 -> a
-    45:57:void write(java.util.concurrent.ExecutorService):249:261 -> a
-    58:115:void write(java.util.concurrent.ExecutorService):260:317 -> a
-    116:116:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
-    116:116:void write(java.util.concurrent.ExecutorService):317 -> a
-    117:129:void write(java.util.concurrent.ExecutorService):317:329 -> a
-    130:138:void write(java.util.concurrent.ExecutorService):323:331 -> a
-    139:139:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):254:254 -> a
-    140:144:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):265:269 -> a
-    145:145:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():345:345 -> a
-    145:145:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):269 -> a
-    146:153:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):272:279 -> a
-    154:154:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():341:341 -> a
-    154:154:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):279 -> a
-    155:158:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):283:286 -> a
-    159:159:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):285:285 -> a
-    160:172:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):585:597 -> a
-    160:172:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):288 -> a
-    173:181:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):289:297 -> a
-    182:192:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):294:304 -> a
-    193:202:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):301:310 -> a
-    203:206:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):342:345 -> a
-    207:213:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):343:349 -> a
-    214:216:boolean validateProguardMapParses(java.lang.String):452:454 -> a
-    214:216:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):349 -> a
-    217:224:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):349:356 -> a
-    225:272:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):355:402 -> a
-    273:273:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):401:401 -> a
-    274:274:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):378:378 -> a
-    275:284:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):377:386 -> a
-    285:293:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):381:389 -> a
-    294:294:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):380:380 -> a
-    295:295:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):379:379 -> a
-    296:329:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):412:445 -> a
-    330:343:void insertAttributeAnnotations():462:475 -> a
-    344:344:void insertAttributeAnnotations():474:474 -> a
-    345:353:void insertAttributeAnnotations():473:481 -> a
-    354:354:void insertAttributeAnnotations():480:480 -> a
-    355:371:void insertAttributeAnnotations():479:495 -> a
-    372:378:void insertAttributeAnnotations():494:500 -> a
-    379:388:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
-    379:388:void insertAttributeAnnotations():498 -> a
-    389:397:void insertAttributeAnnotations():497:505 -> a
-    398:398:void insertAttributeAnnotations():504:504 -> a
-    399:410:void insertAttributeAnnotations():503:514 -> a
-    411:421:void insertAttributeAnnotations():513:523 -> a
-    422:422:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
-    422:422:void insertAttributeAnnotations():521 -> a
-    423:423:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    423:423:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
-    423:423:void insertAttributeAnnotations():521 -> a
-    424:425:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
-    424:425:void insertAttributeAnnotations():521 -> a
-    426:435:void insertAttributeAnnotations():521:530 -> a
-    436:438:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):546:548 -> a
-    439:439:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    439:439:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):549 -> a
-    440:441:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):552:553 -> a
-    442:442:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    442:442:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):554 -> a
-    443:446:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):559:562 -> a
-    447:447:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
-    447:447:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):578 -> a
-    448:458:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):564:574 -> a
-    459:460:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):601:602 -> a
-    459:460:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):610 -> a
-    461:461:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):610:610 -> a
-    462:467:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):606:611 -> a
+    6:14:void encodeChecksums(java.lang.Iterable):209:217 -> a
+    15:45:void write(java.util.concurrent.ExecutorService):222:252 -> a
+    46:58:void write(java.util.concurrent.ExecutorService):250:262 -> a
+    59:116:void write(java.util.concurrent.ExecutorService):261:318 -> a
+    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    117:117:void write(java.util.concurrent.ExecutorService):318 -> a
+    118:130:void write(java.util.concurrent.ExecutorService):318:330 -> a
+    131:139:void write(java.util.concurrent.ExecutorService):324:332 -> a
+    140:140:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):255:255 -> a
+    141:145:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):266:270 -> a
+    146:146:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():345:345 -> a
+    146:146:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):270 -> a
+    147:154:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):273:280 -> a
+    155:155:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():341:341 -> a
+    155:155:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):280 -> a
+    156:159:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):284:287 -> a
+    160:160:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):286:286 -> a
+    161:173:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):586:598 -> a
+    161:173:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):289 -> a
+    174:182:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):290:298 -> a
+    183:193:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):295:305 -> a
+    194:203:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):302:311 -> a
+    204:207:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):343:346 -> a
+    208:214:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):344:350 -> a
+    215:217:boolean validateProguardMapParses(java.lang.String):453:455 -> a
+    215:217:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):350 -> a
+    218:225:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):350:357 -> a
+    226:273:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):356:403 -> a
+    274:274:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):402:402 -> a
+    275:275:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):379:379 -> a
+    276:285:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):378:387 -> a
+    286:294:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):382:390 -> a
+    295:295:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):381:381 -> a
+    296:296:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):380:380 -> a
+    297:330:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):413:446 -> a
+    331:344:void insertAttributeAnnotations():463:476 -> a
+    345:345:void insertAttributeAnnotations():475:475 -> a
+    346:354:void insertAttributeAnnotations():474:482 -> a
+    355:355:void insertAttributeAnnotations():481:481 -> a
+    356:372:void insertAttributeAnnotations():480:496 -> a
+    373:379:void insertAttributeAnnotations():495:501 -> a
+    380:389:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
+    380:389:void insertAttributeAnnotations():499 -> a
+    390:398:void insertAttributeAnnotations():498:506 -> a
+    399:399:void insertAttributeAnnotations():505:505 -> a
+    400:411:void insertAttributeAnnotations():504:515 -> a
+    412:422:void insertAttributeAnnotations():514:524 -> a
+    423:423:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
+    423:423:void insertAttributeAnnotations():522 -> a
+    424:424:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    424:424:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
+    424:424:void insertAttributeAnnotations():522 -> a
+    425:426:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
+    425:426:void insertAttributeAnnotations():522 -> a
+    427:436:void insertAttributeAnnotations():522:531 -> a
+    437:439:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):547:549 -> a
+    440:440:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    440:440:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):550 -> a
+    441:442:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):553:554 -> a
+    443:443:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    443:443:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):555 -> a
+    444:447:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):560:563 -> a
+    448:448:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
+    448:448:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):579 -> a
+    449:459:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):565:575 -> a
+    460:461:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):602:603 -> a
+    460:461:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):611 -> a
+    462:462:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):611:611 -> a
+    463:468:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):607:612 -> a
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183:183 -> b
     2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():333:333 -> b
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183 -> b
@@ -12933,15 +12938,15 @@
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
     com.android.tools.r8.utils.InternalOptions val$options -> c
-    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):417:417 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):420:423 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):429:429 -> visit
+    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):418:418 -> <init>
+    1:4:void visit(com.android.tools.r8.DataDirectoryResource):421:424 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):430:430 -> visit
     6:6:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):429 -> visit
-    7:12:void visit(com.android.tools.r8.DataEntryResource):434:439 -> visit
-    13:16:void visit(com.android.tools.r8.DataEntryResource):438:441 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):430 -> visit
+    7:12:void visit(com.android.tools.r8.DataEntryResource):435:440 -> visit
+    13:16:void visit(com.android.tools.r8.DataEntryResource):439:442 -> visit
     17:17:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    17:17:void visit(com.android.tools.r8.DataEntryResource):429 -> visit
+    17:17:void visit(com.android.tools.r8.DataEntryResource):430 -> visit
 com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.dex.b$b:
     1:1:void <init>():81:81 -> <init>
     2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):81:81 -> <init>
@@ -13016,9 +13021,9 @@
     1:3:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):103:105 -> b
     1:3:java.lang.String convertType(com.android.tools.r8.graph.DexType):120:122 -> c
     1:1:void keepClass(com.android.tools.r8.graph.DexType):110:110 -> d
-    2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):337:344 -> d
+    2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):344:351 -> d
     2:9:void keepClass(com.android.tools.r8.graph.DexType):110 -> d
-    10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):342:346 -> d
+    10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):349:353 -> d
     10:14:void keepClass(com.android.tools.r8.graph.DexType):110 -> d
     15:15:void keepClass(com.android.tools.r8.graph.DexType):111:111 -> d
     1:1:boolean shouldKeep(com.android.tools.r8.graph.DexType):64:64 -> e
@@ -15247,7 +15252,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.FeatureSplitConfiguration -> com.android.tools.r8.q.a:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.s.a:
     java.util.List featureSplits -> a
     java.util.Map javaTypeToFeatureSplitMapping -> b
     boolean $assertionsDisabled -> c
@@ -15268,7 +15273,7 @@
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):127:127 -> a
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     1:1:java.util.List getFeatureSplits():132:132 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.q.a$a:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.s.a$a:
     com.android.tools.r8.DataResourceConsumer consumer -> b
     java.util.Set providers -> a
     1:3:void <init>(java.util.Set,com.android.tools.r8.DataResourceConsumer):72:74 -> <init>
@@ -15366,27 +15371,27 @@
     2:2:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):109 -> a
     3:3:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):109:109 -> a
     4:10:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):105:111 -> a
-    11:16:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):325:330 -> a
-    17:17:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):383:383 -> a
+    11:16:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):326:331 -> a
+    17:17:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):384:384 -> a
     18:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):636:642 -> a
-    18:24:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):383 -> a
+    18:24:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):384 -> a
     25:27:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):658:660 -> a
     25:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):649 -> a
-    25:27:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):383 -> a
+    25:27:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):384 -> a
     28:28:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():148:148 -> a
     28:28:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):660 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):649 -> a
-    28:28:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):383 -> a
+    28:28:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):384 -> a
     29:31:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):660:662 -> a
     29:31:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):649 -> a
-    29:31:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):383 -> a
-    32:51:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):385:404 -> a
-    52:54:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):433:435 -> a
-    55:62:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):441:448 -> a
-    63:63:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):472:472 -> a
-    63:63:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):449 -> a
-    64:74:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):451:461 -> a
-    75:75:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1163:1163 -> a
+    29:31:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):384 -> a
+    32:51:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):386:405 -> a
+    52:54:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):434:436 -> a
+    55:62:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):442:449 -> a
+    63:63:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):473:473 -> a
+    63:63:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):450 -> a
+    64:74:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):452:462 -> a
+    75:75:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1170:1170 -> a
     75:75:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):108 -> a
     76:76:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):108:108 -> a
     1:5:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):92:96 -> addSynthesizedClass
@@ -15405,45 +15410,45 @@
     1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):162:162 -> definitionForProgramType
     1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():87:88 -> dexItemFactory
     1:2:java.util.Collection getSynthesizedClassesForSanityCheck():100:101 -> getSynthesizedClassesForSanityCheck
-    1:1:boolean hasLiveness():609:609 -> hasLiveness
-    1:1:boolean hasSubtyping():599:599 -> hasSubtyping
+    1:1:boolean hasLiveness():610:610 -> hasLiveness
+    1:1:boolean hasSubtyping():600:600 -> hasSubtyping
     1:1:void invalidateTypeCacheFor(com.android.tools.r8.graph.DexType):201:201 -> invalidateTypeCacheFor
-    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):619:620 -> isInMainDexList
+    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):620:621 -> isInMainDexList
     1:1:boolean isObsolete():64:64 -> isObsolete
     1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):251:254 -> lookupDirectTarget
-    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):533:536 -> lookupInstanceTarget
+    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):534:537 -> lookupInstanceTarget
     1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):214:217 -> lookupStaticTarget
-    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):546:549 -> lookupStaticTarget
+    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):547:550 -> lookupStaticTarget
     1:4:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):231:234 -> lookupSuperTarget
     5:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):238:239 -> lookupSuperTarget
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):264:268 -> lookupVirtualTarget
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):266:269 -> lookupVirtualTarget
     1:1:void markObsolete():68:68 -> markObsolete
     1:1:com.android.tools.r8.utils.InternalOptions options():56:56 -> options
     1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):166:168 -> originFor
-    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):557:558 -> resolveField
-    1:3:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):568:570 -> resolveFieldOn
-    4:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):574:590 -> resolveFieldOn
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMaximallySpecificMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):415:423 -> resolveMaximallySpecificMethods
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):282:290 -> resolveMethod
-    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):294:296 -> resolveMethod
-    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):311:314 -> resolveMethod
-    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):346:358 -> resolveMethodOnClass
-    14:22:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):362:370 -> resolveMethodOnClass
-    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):487:501 -> resolveMethodOnInterface
-    16:34:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):505:523 -> resolveMethodOnInterface
+    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):558:559 -> resolveField
+    1:3:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):569:571 -> resolveFieldOn
+    4:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):575:591 -> resolveFieldOn
+    1:9:com.android.tools.r8.graph.ResolutionResult resolveMaximallySpecificMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):416:424 -> resolveMaximallySpecificMethods
+    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):283:291 -> resolveMethod
+    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):295:297 -> resolveMethod
+    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):312:315 -> resolveMethod
+    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):347:359 -> resolveMethodOnClass
+    14:22:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):363:371 -> resolveMethodOnClass
+    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):488:502 -> resolveMethodOnInterface
+    16:34:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):506:524 -> resolveMethodOnInterface
     1:1:void unsetObsolete():72:72 -> unsetObsolete
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():614:614 -> withLiveness
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():604:604 -> withSubtyping
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():615:615 -> withLiveness
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():605:605 -> withSubtyping
 com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder -> com.android.tools.r8.graph.c$a:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     java.util.LinkedHashMap maximallySpecificMethods -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():623:623 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass):635:635 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexClass):633:636 -> <init>
-    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):641:649 -> a
-    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):657:671 -> a
-    25:65:com.android.tools.r8.graph.ResolutionResult resolve():676:716 -> a
+    1:1:void <clinit>():624:624 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass):636:636 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexClass):634:637 -> <init>
+    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):642:650 -> a
+    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):658:672 -> a
+    25:65:com.android.tools.r8.graph.ResolutionResult resolve():677:717 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.graph.d:
     1:8:void <clinit>():29:36 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):135:135 -> <init>
@@ -16072,7 +16077,7 @@
     1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):32:32 -> a
     2:2:boolean isEmpty():80:80 -> a
     3:3:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88:88 -> a
-    4:4:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    4:4:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88 -> a
     5:6:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):96:97 -> a
     7:7:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):146:146 -> a
@@ -16329,11 +16334,11 @@
     23:26:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):196:199 -> a
     27:30:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):203:206 -> a
     31:33:java.util.Map kotlinConstructors(java.util.List,com.android.tools.r8.graph.AppView):219:221 -> a
-    34:38:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor com.android.tools.r8.graph.DexEncodedMethod.findCompatibleKotlinConstructor(java.util.List,com.android.tools.r8.graph.AppView):358:362 -> a
+    34:38:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor com.android.tools.r8.graph.DexEncodedMethod.findCompatibleKotlinConstructor(java.util.List,com.android.tools.r8.graph.AppView):365:369 -> a
     34:38:java.util.Map kotlinConstructors(java.util.List,com.android.tools.r8.graph.AppView):222 -> a
     39:43:java.util.Map kotlinConstructors(java.util.List,com.android.tools.r8.graph.AppView):225:229 -> a
     44:49:java.util.List kotlinFunctions(java.util.List,java.util.List,com.android.tools.r8.graph.AppView):247:252 -> a
-    50:70:boolean com.android.tools.r8.graph.DexEncodedMethod.isKotlinProperty(java.util.List):398:418 -> a
+    50:70:boolean com.android.tools.r8.graph.DexEncodedMethod.isKotlinProperty(java.util.List):405:425 -> a
     50:70:java.util.List kotlinFunctions(java.util.List,java.util.List,com.android.tools.r8.graph.AppView):253 -> a
     71:74:java.util.List kotlinFunctions(java.util.List,java.util.List,com.android.tools.r8.graph.AppView):255:258 -> a
     75:75:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):358:358 -> a
@@ -16405,12 +16410,12 @@
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):625:625 -> c
     10:16:boolean isResolvable(com.android.tools.r8.graph.AppView):808:814 -> c
     17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
-    17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):292 -> c
+    17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):299 -> c
     17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> c
-    18:18:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):293:293 -> c
+    18:18:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):300:300 -> c
     18:18:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> c
     19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
-    19:19:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):292 -> c
+    19:19:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):299 -> c
     19:19:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> c
     20:23:boolean isResolvable(com.android.tools.r8.graph.AppView):821:824 -> c
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):152:152 -> collectMixedSectionItems
@@ -16951,10 +16956,10 @@
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):202:202 -> <init>
     2:74:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):137:209 -> <init>
     75:76:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):219:220 -> <init>
-    1:2:boolean isDirectMethod():331:332 -> A
+    1:2:boolean isDirectMethod():338:339 -> A
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> A
-    3:3:boolean isDirectMethod():332 -> A
-    4:4:boolean isDirectMethod():332:332 -> A
+    3:3:boolean isDirectMethod():339 -> A
+    4:4:boolean isDirectMethod():339:339 -> A
     1:1:boolean isFinal():261:261 -> B
     1:2:boolean isInitializer():265:266 -> C
     1:2:boolean isInstanceInitializer():270:271 -> D
@@ -16962,34 +16967,34 @@
     3:3:boolean isInstanceInitializer():271 -> D
     4:4:boolean isInstanceInitializer():271:271 -> D
     1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():224:224 -> E
-    1:2:boolean isNonAbstractNonNativeMethod():308:309 -> F
-    1:2:boolean isNonAbstractVirtualMethod():303:304 -> G
-    1:1:boolean isObsolete():161:161 -> H
-    1:1:boolean isOnlyInlinedIntoNestMembers():426:426 -> I
-    1:2:boolean isPrivateMethod():323:324 -> J
-    1:2:boolean isProcessed():252:253 -> K
-    1:2:boolean isPublicMethod():318:319 -> L
-    1:2:boolean isPublicized():313:314 -> M
-    1:2:boolean isStatic():337:338 -> N
-    1:2:boolean isSyntheticMethod():351:352 -> O
-    1:2:boolean isVirtualMethod():294:295 -> P
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> P
-    3:3:boolean isVirtualMethod():295 -> P
-    1:2:void markNotProcessed():530:531 -> Q
-    1:2:java.lang.String qualifiedName():656:657 -> R
-    1:2:void removeCode():633:634 -> S
-    1:1:void setObsolete():167:167 -> T
-    1:1:boolean shouldNotHaveCode():620:620 -> U
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():704:710 -> V
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> V
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():710 -> V
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():711:711 -> V
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():775:781 -> W
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():751:760 -> X
-    1:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1113:1121 -> Y
-    10:10:void setObsolete():167:167 -> Y
-    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1122 -> Y
-    1:1:void unsetObsolete():194:194 -> Z
+    1:2:boolean isNonAbstractNonNativeMethod():315:316 -> F
+    1:2:boolean isNonAbstractVirtualMethod():310:311 -> G
+    1:2:boolean isNonPrivateVirtualMethod():301:302 -> H
+    1:1:boolean isObsolete():161:161 -> I
+    1:1:boolean isOnlyInlinedIntoNestMembers():433:433 -> J
+    1:2:boolean isPrivateMethod():330:331 -> K
+    1:2:boolean isProcessed():252:253 -> L
+    1:2:boolean isPublicMethod():325:326 -> M
+    1:2:boolean isPublicized():320:321 -> N
+    1:2:boolean isStatic():344:345 -> O
+    1:2:boolean isSyntheticMethod():358:359 -> P
+    1:2:boolean isVirtualMethod():296:297 -> Q
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> Q
+    3:3:boolean isVirtualMethod():297 -> Q
+    1:2:void markNotProcessed():537:538 -> R
+    1:2:java.lang.String qualifiedName():663:664 -> S
+    1:2:void removeCode():640:641 -> T
+    1:1:void setObsolete():167:167 -> U
+    1:1:boolean shouldNotHaveCode():627:627 -> V
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():711:717 -> W
+    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> W
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():717 -> W
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():718:718 -> W
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():782:788 -> X
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():758:767 -> Y
+    1:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1120:1128 -> Z
+    10:10:void setObsolete():167:167 -> Z
+    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1129 -> Z
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$302(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):82:82 -> a
     2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):82:82 -> a
     3:5:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):228:230 -> a
@@ -17001,177 +17006,178 @@
     15:15:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):236 -> a
     16:21:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):235:240 -> a
     22:24:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):244:246 -> a
-    25:26:boolean isStaticMember():343:344 -> a
-    25:26:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinExtension(java.util.List,com.android.tools.r8.graph.AppView):371 -> a
-    27:28:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinExtension(java.util.List,com.android.tools.r8.graph.AppView):374:375 -> a
-    29:30:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):434:435 -> a
-    31:86:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):444:499 -> a
-    87:87:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):495:495 -> a
-    88:88:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):491:491 -> a
-    89:92:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):484:487 -> a
-    93:96:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):477:480 -> a
-    97:100:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):470:473 -> a
-    101:104:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):463:466 -> a
-    105:124:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):504:523 -> a
-    125:125:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):520:520 -> a
-    126:126:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):517:517 -> a
-    127:127:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):514:514 -> a
-    128:128:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):511:511 -> a
-    129:147:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):508:526 -> a
-    148:149:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):535:536 -> a
-    150:151:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):545:546 -> a
-    152:155:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):551:554 -> a
-    156:156:boolean hasParameterInfo():579:579 -> a
-    156:156:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):554 -> a
-    157:158:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):554:555 -> a
-    159:160:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):574:575 -> a
-    159:160:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):555 -> a
-    161:161:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):557:557 -> a
-    162:164:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):561:563 -> a
-    165:168:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):567:570 -> a
-    169:170:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1204:1205 -> a
-    169:170:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):570 -> a
-    171:171:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):570:570 -> a
-    172:177:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):611:616 -> a
-    178:186:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):666:674 -> a
-    187:199:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):678:690 -> a
+    25:26:boolean isStaticMember():350:351 -> a
+    25:26:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinExtension(java.util.List,com.android.tools.r8.graph.AppView):378 -> a
+    27:28:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinExtension(java.util.List,com.android.tools.r8.graph.AppView):381:382 -> a
+    29:30:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):441:442 -> a
+    31:86:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):451:506 -> a
+    87:87:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):502:502 -> a
+    88:88:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):498:498 -> a
+    89:92:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):491:494 -> a
+    93:96:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):484:487 -> a
+    97:100:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):477:480 -> a
+    101:104:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):470:473 -> a
+    105:124:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):511:530 -> a
+    125:125:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):527:527 -> a
+    126:126:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):524:524 -> a
+    127:127:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):521:521 -> a
+    128:128:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):518:518 -> a
+    129:147:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):515:533 -> a
+    148:149:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):542:543 -> a
+    150:151:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):552:553 -> a
+    152:155:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):558:561 -> a
+    156:156:boolean hasParameterInfo():586:586 -> a
+    156:156:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):561 -> a
+    157:158:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):561:562 -> a
+    159:160:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):581:582 -> a
+    159:160:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):562 -> a
+    161:161:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):564:564 -> a
+    162:164:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):568:570 -> a
+    165:168:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):574:577 -> a
+    169:170:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1211:1212 -> a
+    169:170:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):577 -> a
+    171:171:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):577:577 -> a
+    172:177:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):618:623 -> a
+    178:186:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):673:681 -> a
+    187:199:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):685:697 -> a
     200:257:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:389 -> a
-    200:257:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):691 -> a
-    258:261:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):691:694 -> a
-    262:271:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):721:730 -> a
-    272:273:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):785:786 -> a
-    274:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):808:812 -> a
-    274:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
-    279:286:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):811:818 -> a
-    279:286:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
-    287:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):817:823 -> a
-    287:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
-    294:309:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):821:836 -> a
-    294:309:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
+    200:257:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):698 -> a
+    258:261:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):698:701 -> a
+    262:271:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):728:737 -> a
+    272:273:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):792:793 -> a
+    274:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):815:819 -> a
+    274:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):793 -> a
+    279:286:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):818:825 -> a
+    279:286:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):793 -> a
+    287:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):824:830 -> a
+    287:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):793 -> a
+    294:309:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):828:843 -> a
+    294:309:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):793 -> a
     310:310:void setObsolete():167:167 -> a
-    310:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):837 -> a
-    310:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
-    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):838:838 -> a
-    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
-    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788:788 -> a
-    313:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):842:846 -> a
-    313:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    318:326:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):845:853 -> a
-    318:326:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    327:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):850:858 -> a
-    327:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    336:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):855:863 -> a
-    336:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    345:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):861:865 -> a
-    345:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    350:351:boolean isStaticMember():343:344 -> a
-    350:351:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):866 -> a
-    350:351:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    352:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):870:892 -> a
-    352:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    310:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):844 -> a
+    310:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):793 -> a
+    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):845:845 -> a
+    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):793 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795:795 -> a
+    313:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):849:853 -> a
+    313:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    318:326:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):852:860 -> a
+    318:326:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    327:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):857:865 -> a
+    327:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    336:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):862:870 -> a
+    336:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    345:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):868:872 -> a
+    345:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    350:351:boolean isStaticMember() -> a
+    350:351:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):873 -> a
+    350:351:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    352:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):877:899 -> a
+    352:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
     375:375:void setObsolete():167:167 -> a
-    375:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):893 -> a
-    375:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):894:894 -> a
-    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
-    377:381:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):793:797 -> a
-    382:385:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):796:799 -> a
+    375:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):900 -> a
+    375:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):901:901 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):795 -> a
+    377:381:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):800:804 -> a
+    382:385:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):803:806 -> a
     386:386:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
-    386:386:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):799 -> a
-    387:387:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):800:800 -> a
-    388:392:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):799:803 -> a
-    393:394:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):898:899 -> a
-    395:409:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):903:917 -> a
-    410:430:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):933:953 -> a
+    386:386:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):806 -> a
+    387:387:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):807:807 -> a
+    388:392:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):806:810 -> a
+    393:394:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):905:906 -> a
+    395:409:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):910:924 -> a
+    410:430:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):940:960 -> a
     431:431:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():188:188 -> a
-    431:431:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):953 -> a
-    432:432:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):954:954 -> a
-    433:438:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959:964 -> a
-    439:462:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):961:984 -> a
-    463:463:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):969:969 -> a
-    464:467:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):972:975 -> a
-    468:468:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
-    468:468:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
-    468:468:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):976 -> a
-    469:469:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
-    469:469:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):976 -> a
-    470:472:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):977:979 -> a
-    473:473:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
-    473:473:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):979 -> a
-    474:475:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):979:980 -> a
-    476:478:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):988:990 -> a
-    479:486:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1001:1008 -> a
-    487:492:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1043:1048 -> a
+    431:431:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):960 -> a
+    432:432:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):961:961 -> a
+    433:438:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):966:971 -> a
+    439:462:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):968:991 -> a
+    463:463:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):976:976 -> a
+    464:467:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):979:982 -> a
+    468:468:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():480:480 -> a
+    468:468:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():496 -> a
+    468:468:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):983 -> a
+    469:469:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():496:496 -> a
+    469:469:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):983 -> a
+    470:472:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):984:986 -> a
+    473:473:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():488:488 -> a
+    473:473:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):986 -> a
+    474:475:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):986:987 -> a
+    476:478:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):995:997 -> a
+    479:486:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1008:1015 -> a
+    487:492:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1050:1055 -> a
     493:493:void com.android.tools.r8.graph.AccessFlags.demote(int):276:276 -> a
     493:493:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():233 -> a
-    493:493:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1048 -> a
-    494:501:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1050:1057 -> a
+    493:493:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1055 -> a
+    494:501:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1057:1064 -> a
     502:502:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> a
-    502:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1057 -> a
-    503:503:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1060:1060 -> a
+    502:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1064 -> a
+    503:503:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1067:1067 -> a
     504:504:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    504:504:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1060 -> a
-    505:522:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1062:1079 -> a
+    504:504:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1067 -> a
+    505:522:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1069:1086 -> a
     523:523:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():140:140 -> a
-    523:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1079 -> a
-    524:527:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1081:1084 -> a
-    528:543:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1089:1104 -> a
-    544:555:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1129:1140 -> a
-    556:566:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1139:1149 -> a
-    567:570:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1190:1193 -> a
+    523:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1086 -> a
+    524:527:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1088:1091 -> a
+    528:543:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1096:1111 -> a
+    544:555:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1136:1147 -> a
+    556:566:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1146:1156 -> a
+    567:570:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1197:1200 -> a
     571:571:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    571:571:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1193 -> a
-    572:572:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1195:1195 -> a
-    573:574:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1217:1218 -> a
-    575:576:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1228:1229 -> a
-    577:577:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1233:1233 -> a
-    578:579:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1204:1205 -> a
-    578:579:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1235 -> a
-    580:584:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1235:1239 -> a
-    1:1:void checkIfObsolete():155:155 -> a0
+    571:571:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1200 -> a
+    572:572:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1202:1202 -> a
+    573:574:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1224:1225 -> a
+    575:576:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1235:1236 -> a
+    577:577:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1240:1240 -> a
+    578:579:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1211:1212 -> a
+    578:579:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1242 -> a
+    580:584:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1242:1246 -> a
+    1:1:void unsetObsolete():194:194 -> a0
     1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):175:179 -> b
     6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> b
     6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):179 -> b
     7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):180:181 -> b
-    9:10:boolean isStaticMember():343:344 -> b
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinFunction(java.util.List,com.android.tools.r8.graph.AppView):383 -> b
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinFunction(java.util.List,com.android.tools.r8.graph.AppView):386:387 -> b
-    13:16:void upgradeClassFileVersion(int):649:652 -> b
-    17:44:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):1012:1039 -> b
-    45:48:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):1073:1076 -> b
+    9:10:boolean isStaticMember():350:351 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinFunction(java.util.List,com.android.tools.r8.graph.AppView):390 -> b
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinFunction(java.util.List,com.android.tools.r8.graph.AppView):393:394 -> b
+    13:16:void upgradeClassFileVersion(int):656:659 -> b
+    17:44:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):1019:1046 -> b
+    45:48:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):1080:1083 -> b
+    1:1:void checkIfObsolete():155:155 -> b0
     1:1:com.android.tools.r8.graph.Code access$200(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> c
-    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):948:948 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1180:1180 -> c
-    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):595:601 -> collectIndexedItems
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):606:606 -> collectMixedSectionItems
+    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):955:955 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1187:1187 -> c
+    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):602:608 -> collectIndexedItems
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):613:613 -> collectMixedSectionItems
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$300(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> d
-    2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):1027:1030 -> d
+    2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):1034:1037 -> d
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$400(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> e
     1:1:int access$500(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> f
-    2:2:boolean isDexEncodedMethod():1174:1174 -> f
-    1:2:boolean isStaticMember():343:344 -> g
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1244:1244 -> g
-    1:2:com.android.tools.r8.graph.DexReference toReference():1168:1169 -> h
-    1:1:com.android.tools.r8.graph.DexMethod getKey():1163:1163 -> i
-    2:2:com.android.tools.r8.graph.DexMethod getKey():1163:1163 -> i
+    2:2:boolean isDexEncodedMethod():1181:1181 -> f
+    1:2:boolean isStaticMember():350:351 -> g
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1251:1251 -> g
+    1:2:com.android.tools.r8.graph.DexReference toReference():1175:1176 -> h
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1170:1170 -> i
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1170:1170 -> i
     2:2:com.android.tools.r8.graph.PresortedComparable getKey():82 -> i
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():764:771 -> j
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():740:741 -> k
-    1:2:java.lang.String codeToString():1155:1156 -> l
-    1:2:java.lang.String descriptor():661:662 -> m
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1222:1223 -> n
-    1:3:int getClassFileVersion():638:640 -> o
-    1:2:com.android.tools.r8.graph.Code getCode():628:629 -> p
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():771:778 -> j
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():747:748 -> k
+    1:2:java.lang.String codeToString():1162:1163 -> l
+    1:2:java.lang.String descriptor():668:669 -> m
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1229:1230 -> n
+    1:3:int getClassFileVersion():645:647 -> o
+    1:2:com.android.tools.r8.graph.Code getCode():635:636 -> p
     1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():171:171 -> q
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1209:1213 -> r
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1204:1205 -> s
-    1:1:java.util.Map getParameterInfo():583:583 -> t
-    1:2:java.lang.String toSourceString():699:700 -> toSourceString
-    1:2:java.lang.String toString():588:589 -> toString
-    1:2:boolean hasAnnotation():1185:1186 -> u
-    1:2:boolean hasClassFileVersion():644:645 -> v
-    1:1:boolean hasCode():624:624 -> w
-    1:1:boolean hasParameterInfo():579:579 -> x
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1216:1220 -> r
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1211:1212 -> s
+    1:1:java.util.Map getParameterInfo():590:590 -> t
+    1:2:java.lang.String toSourceString():706:707 -> toSourceString
+    1:2:java.lang.String toString():595:596 -> toString
+    1:2:boolean hasAnnotation():1192:1193 -> u
+    1:2:boolean hasClassFileVersion():651:652 -> v
+    1:1:boolean hasCode():631:631 -> w
+    1:1:boolean hasParameterInfo():586:586 -> x
     1:2:boolean isClassInitializer():280:281 -> y
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> y
     3:3:boolean isClassInitializer():281 -> y
@@ -17191,26 +17197,26 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:1:void <clinit>():1247:1247 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1247:1247 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1258:1274 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1270:1270 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1247:1247 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1279:1279 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1288:1307 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1283:1283 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1307 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1310:1312 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1283:1283 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1310 -> a
-    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1332:1334 -> a
-    31:31:void setCode(com.android.tools.r8.graph.Code):1340:1340 -> a
-    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1344:1349 -> b
-    7:13:com.android.tools.r8.graph.DexEncodedMethod build():1348:1354 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1317:1317 -> c
+    1:1:void <clinit>():1254:1254 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1254:1254 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1265:1281 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1277:1277 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1254:1254 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1286:1286 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1295:1314 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1290:1290 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1314 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1317:1319 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1290:1290 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1317 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1339:1341 -> a
+    31:31:void setCode(com.android.tools.r8.graph.Code):1347:1347 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1351:1356 -> b
+    7:13:com.android.tools.r8.graph.DexEncodedMethod build():1355:1361 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1324:1324 -> c
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():246:246 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1317 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1322:1326 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1324 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1329:1333 -> d
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.T$c:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_NEST -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> g
@@ -17234,17 +17240,17 @@
     4:4:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):63:63 -> a
     5:13:int slowCompareTo(com.android.tools.r8.graph.DexField):83:91 -> a
     14:14:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109:109 -> a
-    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     15:15:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     16:16:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113:113 -> a
     17:17:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
     17:17:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
     18:18:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117:117 -> a
-    19:19:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    19:19:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117 -> a
     20:20:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
-    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     22:22:boolean match(com.android.tools.r8.graph.DexEncodedField):127:127 -> a
     23:23:boolean match(com.android.tools.r8.graph.DexField):122:122 -> a
@@ -17886,7 +17892,7 @@
     4:4:int slowCompareTo(java.lang.Object):12:12 -> a
     5:5:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
     6:6:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
-    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     7:7:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     8:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
     9:9:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
@@ -17896,7 +17902,7 @@
     11:11:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> a
     12:12:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
     12:12:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    13:13:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    13:13:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     13:13:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     14:14:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
     15:26:java.lang.String toSourceString(boolean):179:190 -> a
@@ -18198,10 +18204,10 @@
     2:2:int slowCompareTo(java.lang.Object):9:9 -> a
     3:3:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):58:58 -> a
     4:4:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86:86 -> a
-    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     5:5:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     6:6:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):88:88 -> a
-    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     7:7:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     8:15:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):103:110 -> a
     1:3:int slowCompareTo(com.android.tools.r8.graph.DexProto):68:70 -> b
@@ -18305,69 +18311,69 @@
     1:6:void <clinit>():33:38 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexString):43:43 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexString):41:46 -> <init>
-    1:1:char toShorty():120:120 -> A
+    1:1:char toShorty():127:127 -> A
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):33:33 -> a
-    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):183:184 -> a
+    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):190:191 -> a
     2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):33 -> a
     4:4:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
-    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):185 -> a
+    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):192 -> a
     4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):33 -> a
     5:5:int slowCompareTo(java.lang.Object):33:33 -> a
     6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):83:83 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     7:7:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):84 -> a
-    8:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):84:85 -> a
-    10:10:boolean isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
-    11:11:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):151:151 -> a
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    12:12:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):68 -> a
-    13:13:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):69:69 -> a
-    14:16:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):350:352 -> a
-    17:21:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):356:360 -> a
-    22:24:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):364:366 -> a
-    25:27:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):365:367 -> a
-    28:35:java.lang.String getPackageOrName(boolean):371:378 -> a
-    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):171:171 -> b
-    2:7:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):325:330 -> b
-    8:10:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):329:331 -> b
-    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):137:138 -> collectIndexedItems
+    8:15:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):84:91 -> a
+    16:16:boolean isSamePackage(com.android.tools.r8.graph.DexType):98:98 -> a
+    17:17:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):158:158 -> a
+    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    18:18:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):68 -> a
+    19:19:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):69:69 -> a
+    20:22:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):357:359 -> a
+    23:27:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):363:367 -> a
+    28:30:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):371:373 -> a
+    31:33:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):372:374 -> a
+    34:41:java.lang.String getPackageOrName(boolean):378:385 -> a
+    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):178:178 -> b
+    2:7:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):332:337 -> b
+    8:10:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):336:338 -> b
+    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):144:145 -> collectIndexedItems
     3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):245:245 -> collectIndexedItems
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):138 -> collectIndexedItems
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):145 -> collectIndexedItems
     1:1:int compareTo(java.lang.Object):33:33 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.graph.DexType):166:166 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.graph.DexType):173:173 -> compareTo
     2:2:int compareTo(java.lang.Object):33 -> compareTo
     1:2:boolean computeEquals(java.lang.Object):56:57 -> computeEquals
     1:1:int computeHashCode():51:51 -> computeHashCode
     com.android.tools.r8.graph.DexType asDexType() -> e
-    1:2:void flushCachedValues():145:146 -> flushCachedValues
+    1:2:void flushCachedValues():152:153 -> flushCachedValues
     boolean isDexType() -> h
-    1:16:int elementSizeForPrimitiveArrayType():297:312 -> i
-    1:2:java.lang.String getInternalName():395:396 -> j
-    1:4:java.lang.String getName():387:390 -> k
-    1:1:int getNumberOfLeadingSquareBrackets():318:318 -> l
-    1:1:java.lang.String getPackageDescriptor():383:383 -> m
-    1:4:java.lang.String toBinaryName():99:102 -> n
-    1:4:java.lang.String getPackageName():400 -> n
-    5:8:java.lang.String toBinaryName():100:103 -> n
-    5:8:java.lang.String getPackageName():400 -> n
-    9:9:java.lang.String getPackageName():400:400 -> n
-    1:1:boolean isArrayType():229:229 -> o
-    1:1:boolean isBooleanType():197:197 -> p
-    1:1:boolean isClassType():234:234 -> q
-    1:13:boolean isD8R8SynthesizedClassType():261:273 -> r
-    14:15:boolean oldSynthesizedName(java.lang.String):278:279 -> r
-    14:15:boolean isD8R8SynthesizedClassType():274 -> r
-    1:1:boolean isDoubleType():225:225 -> s
-    1:1:boolean isIntType():213:213 -> t
-    1:1:java.lang.String toSmaliString():126:126 -> toSmaliString
-    1:9:java.lang.String toSourceString():108:116 -> toSourceString
-    1:1:java.lang.String toString():131:131 -> toString
-    1:1:boolean isLongType():221:221 -> u
-    1:4:boolean isPrimitiveArrayType():245:248 -> v
-    1:1:boolean isPrimitiveType():189:189 -> w
-    1:2:boolean isReferenceType():239:240 -> x
-    1:1:boolean isVoidType():193:193 -> y
-    1:1:java.lang.String toDescriptorString():95:95 -> z
+    1:16:int elementSizeForPrimitiveArrayType():304:319 -> i
+    1:2:java.lang.String getInternalName():402:403 -> j
+    1:4:java.lang.String getName():394:397 -> k
+    1:1:int getNumberOfLeadingSquareBrackets():325:325 -> l
+    1:1:java.lang.String getPackageDescriptor():390:390 -> m
+    1:4:java.lang.String toBinaryName():106:109 -> n
+    1:4:java.lang.String getPackageName():407 -> n
+    5:8:java.lang.String toBinaryName():107:110 -> n
+    5:8:java.lang.String getPackageName():407 -> n
+    9:9:java.lang.String getPackageName():407:407 -> n
+    1:1:boolean isArrayType():236:236 -> o
+    1:1:boolean isBooleanType():204:204 -> p
+    1:1:boolean isClassType():241:241 -> q
+    1:13:boolean isD8R8SynthesizedClassType():268:280 -> r
+    14:15:boolean oldSynthesizedName(java.lang.String):285:286 -> r
+    14:15:boolean isD8R8SynthesizedClassType():281 -> r
+    1:1:boolean isDoubleType():232:232 -> s
+    1:1:boolean isIntType():220:220 -> t
+    1:1:java.lang.String toSmaliString():133:133 -> toSmaliString
+    1:9:java.lang.String toSourceString():115:123 -> toSourceString
+    1:1:java.lang.String toString():138:138 -> toString
+    1:1:boolean isLongType():228:228 -> u
+    1:4:boolean isPrimitiveArrayType():252:255 -> v
+    1:1:boolean isPrimitiveType():196:196 -> w
+    1:2:boolean isReferenceType():246:247 -> x
+    1:1:boolean isVoidType():200:200 -> y
+    1:1:java.lang.String toDescriptorString():102:102 -> z
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
@@ -18377,7 +18383,7 @@
     3:5:void <init>(com.android.tools.r8.graph.DexType[]):26:28 -> <init>
     1:1:boolean isEmpty():59:59 -> a
     2:8:int compareTo(com.android.tools.r8.graph.DexTypeList):80:86 -> a
-    9:9:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    9:9:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     9:9:int compareTo(com.android.tools.r8.graph.DexTypeList):86 -> a
     10:10:int compareTo(com.android.tools.r8.graph.DexTypeList):92:92 -> a
     1:1:int size():63:63 -> b
@@ -19434,7 +19440,7 @@
     3:5:boolean classRequiresCode():787:789 -> c
     3:5:void visitEnd():797 -> c
     6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1108 -> c
     6:6:boolean classRequiresCode():789 -> c
     6:6:void visitEnd():797 -> c
     7:9:boolean classRequiresCode():789:791 -> c
@@ -19820,7 +19826,7 @@
     9:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createMap(java.util.Collection,java.util.function.Consumer):79:86 -> a
     17:28:com.android.tools.r8.graph.DexProgramClass[] sortClasses(com.android.tools.r8.graph.DexApplication,java.util.Collection):140:151 -> a
     29:31:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):146:148 -> a
-    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
+    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):173:173 -> a
     32:32:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):148 -> a
     33:33:java.util.Collection keysOrEmpty(java.util.Map):155:155 -> a
     34:34:java.util.Collection getCallSites():183:183 -> a
@@ -19930,128 +19936,125 @@
     16:17:void accept(com.android.tools.r8.graph.DexTypeList):50:51 -> b
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.L0:
-    1:1:void <init>():18:18 -> <init>
+com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.L0:
+    com.android.tools.r8.graph.DexProgramClass holder -> a
+    com.android.tools.r8.graph.DexEncodedMethod method -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():9:9 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):13:16 -> <init>
+    1:1:boolean equals(java.lang.Object):21:21 -> equals
+    1:1:int hashCode():26:26 -> hashCode
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.M0:
+    1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
-    boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo) -> a
     com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult asSingleResolution() -> b
     boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> c
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getSingleTarget():52:52 -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getSingleTarget():49:49 -> c
     boolean isFailedResolution() -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> d
     boolean isSingleResolution() -> e
-    boolean isValidVirtualTargetForDynamicDispatch() -> f
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.L0$a:
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.L0$b:
+    boolean isVirtualTarget() -> f
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.M0$a:
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.M0$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():436:436 -> <clinit>
-    1:1:void <init>():438:438 -> <init>
+    1:1:void <clinit>():423:423 -> <clinit>
+    1:1:void <init>():425:425 -> <init>
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
-    boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> d
-    boolean isValidVirtualTargetForDynamicDispatch() -> f
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.L0$c:
+    boolean isVirtualTarget() -> f
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.M0$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():504:504 -> <clinit>
-    1:1:void <init>():506:506 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.L0$d:
-    1:1:void <init>():403:403 -> <init>
+    1:1:void <clinit>():481:481 -> <clinit>
+    1:1:void <init>():483:483 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.M0$d:
+    1:1:void <init>():390:390 -> <init>
     java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo) -> a
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> c
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.L0$e:
-    1:1:void <init>():465:465 -> <init>
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.M0$e:
+    1:1:void <init>():447:447 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     void forEachFailureDependency(java.util.function.Consumer) -> a
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
-    boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     boolean isFailedResolution() -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> d
-    boolean isValidVirtualTargetForDynamicDispatch() -> f
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.L0$f:
+    boolean isVirtualTarget() -> f
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.M0$f:
     java.util.Collection methodsCausingError -> a
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):511:511 -> <init>
-    2:3:void <init>(java.util.Collection):515:516 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):521:521 -> a
-com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.L0$g:
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):488:488 -> <init>
+    2:3:void <init>(java.util.Collection):492:493 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):498:498 -> a
+com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.M0$g:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():545:545 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):548:549 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):545:545 -> a
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.L0$h:
+    1:1:void <clinit>():522:522 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):525:526 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):522:522 -> a
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.M0$h:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> b
-    1:2:void <clinit>():526:527 -> <clinit>
-    1:1:void <init>(java.util.Collection):530:530 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):525:525 -> a
-    2:4:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):534:536 -> a
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.L0$i:
+    1:2:void <clinit>():503:504 -> <clinit>
+    1:1:void <init>(java.util.Collection):507:507 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):502:502 -> a
+    2:4:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):511:513 -> a
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.M0$i:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():542:542 -> <clinit>
-    1:1:void <init>():540:540 -> <init>
-com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.L0$j:
+    1:1:void <clinit>():519:519 -> <clinit>
+    1:1:void <init>():517:517 -> <init>
+com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.M0$j:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> b
     com.android.tools.r8.graph.DexEncodedMethod resolvedMethod -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():85:85 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):99:106 -> <init>
+    1:1:void <clinit>():82:82 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):90:97 -> <init>
     boolean lambda$lookupInvokeSuperTarget$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():114:114 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):230 -> a
-    2:22:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):230:250 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():114:114 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):260 -> a
-    24:49:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):260:285 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():105:105 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):212 -> a
+    2:22:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):212:232 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():105:105 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):242 -> a
+    24:49:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):242:267 -> a
     50:50:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
-    50:50:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):291 -> a
-    51:53:boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):138:140 -> a
-    54:54:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):145:145 -> a
-    55:59:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):215:219 -> a
-    60:60:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithSubtyping):298:298 -> a
-    60:60:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):219 -> a
-    61:61:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):223:223 -> a
-    62:63:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):220:221 -> a
-    64:64:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
-    64:64:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):221 -> a
-    65:65:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    65:65:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):221 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):221:221 -> a
-    67:67:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithSubtyping):298:298 -> a
-    67:67:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):168 -> a
-    68:135:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):328:395 -> a
-    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    136:136:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> a
-    136:136:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):91 -> a
-    137:137:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
-    138:138:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> a
-    138:138:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):92 -> a
-    139:139:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):93:93 -> a
-    140:141:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):367:368 -> a
+    50:50:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):273 -> a
+    51:51:boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):127:127 -> a
+    52:56:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):197:201 -> a
+    57:57:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithSubtyping):280:280 -> a
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):201 -> a
+    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):205:205 -> a
+    59:60:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):202:203 -> a
+    61:61:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
+    61:61:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):203 -> a
+    62:62:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    62:62:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    62:62:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):203 -> a
+    63:63:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):203:203 -> a
+    64:64:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithSubtyping):280:280 -> a
+    64:64:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):150 -> a
+    65:133:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):314:382 -> a
+    134:135:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):354:355 -> a
     com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult asSingleResolution() -> b
-    1:1:boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):129:129 -> b
-    2:4:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):304:306 -> b
-    5:6:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
-    5:6:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):307 -> b
-    7:16:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):309:318 -> b
-    17:18:void lambda$lookupInterfaceTargets$3(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):378:379 -> b
-    1:12:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):163:174 -> c
-    1:10:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):198:207 -> d
+    1:1:boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):120:120 -> b
+    2:9:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):286:293 -> b
+    10:11:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
+    10:11:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):293 -> b
+    12:21:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):295:304 -> b
+    22:23:void lambda$lookupInterfaceTargets$3(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):365:366 -> b
+    1:12:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):145:156 -> c
+    1:10:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):180:189 -> d
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexClass.asDexClass():0:0 -> d
-    11:11:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):201 -> d
+    11:11:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):183 -> d
     boolean isSingleResolution() -> e
-    1:1:boolean isValidVirtualTargetForDynamicDispatch():150:150 -> f
-    1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():110:110 -> g
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():114:114 -> h
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.M0:
+    1:1:boolean isVirtualTarget():132:132 -> f
+    1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():101:101 -> g
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():105:105 -> h
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.N0:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):22:22 -> <init>
     java.lang.String getFileEnding() -> a
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
@@ -20060,7 +20063,7 @@
     20:22:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):66:68 -> a
     23:25:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):73:75 -> a
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):47:59 -> b
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.O0:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):9:9 -> a
@@ -20092,7 +20095,7 @@
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.O0:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.P0:
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
     1:25:void registerCallSite(com.android.tools.r8.graph.DexCallSite):99:123 -> registerCallSite
@@ -20110,12 +20113,12 @@
     46:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):65:65 -> registerMethodHandle
     47:47:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):62:62 -> registerMethodHandle
     1:3:void registerProto(com.android.tools.r8.graph.DexProto):133:135 -> registerProto
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.O0$a:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.P0$a:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     1:2:void <clinit>():20:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.P0.a:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.Q0.a:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     java.util.List r8InstructionSequence -> d
     java.util.List javacInstructionSequence -> c
@@ -20134,13 +20137,13 @@
     49:55:boolean hasJavacClinitAssertionCode(com.android.tools.r8.graph.CfCode):98:104 -> a
     49:55:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     56:56:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.P0.b:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.Q0.b:
     1:1:void <init>():13:13 -> <init>
     void done() -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.P0.d:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.Q0.d:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
@@ -20148,8 +20151,8 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):65:81 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     19:19:void done():87:87 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.P0.c:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.P0.d$a:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.Q0.c:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.Q0.d$a:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):19:19 -> <init>
@@ -20158,22 +20161,22 @@
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     16:16:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):47 -> a
     17:17:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):48:48 -> a
-com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.graph.Q0.a:
+com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.graph.R0.a:
     java.util.Set sources -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(java.util.Set):16:17 -> <init>
     1:4:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):22:25 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.graph.Q0.b:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.graph.R0.b:
     boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.graph.Q0.c:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.graph.R0.c:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>():12:14 -> <init>
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):17:17 -> a
     2:3:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):22:23 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.graph.Q0.d:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.graph.R0.d:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
@@ -20185,7 +20188,7 @@
     1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):34:35 -> b
     1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):39:39 -> c
     1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):24:24 -> d
-com.android.tools.r8.ir.analysis.AbstractError -> com.android.tools.r8.r.a.a:
+com.android.tools.r8.ir.analysis.AbstractError -> com.android.tools.r8.t.a.a:
     com.android.tools.r8.graph.DexType simulatedError -> a
     com.android.tools.r8.ir.analysis.AbstractError TOP -> b
     com.android.tools.r8.ir.analysis.AbstractError BOTTOM -> c
@@ -20199,7 +20202,7 @@
     1:1:boolean isThrowing():48:48 -> b
     1:1:com.android.tools.r8.ir.analysis.AbstractError bottom():36:36 -> c
     1:1:com.android.tools.r8.ir.analysis.AbstractError top():32:32 -> d
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.r.a.c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.t.a.c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
@@ -20224,15 +20227,15 @@
     2:4:void returnMarkingColor():247:249 -> b
     2:4:void notifyCodeHasChanged():238 -> b
     1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():91:91 -> c
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.r.a.b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.t.a.b:
     1:1:void <init>():61:61 -> <init>
     boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction) -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.r.a.c$a:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.t.a.c$a:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
     1:2:void <clinit>():51:52 -> <clinit>
     1:1:void <init>(java.lang.String,int):50:50 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.r.a.c$b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.t.a.c$b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():253:253 -> <clinit>
     1:1:boolean 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):261:261 -> a
@@ -20270,19 +20273,19 @@
     168:168:boolean isTypeInitializedBy(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):517:517 -> a
     169:170:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):541:542 -> a
     1:7: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):478:484 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.r.a.c$c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.t.a.c$c:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
     1:2:void <clinit>():56:57 -> <clinit>
     1:1:void <init>(java.lang.String,int):55:55 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.r.a.d:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.t.a.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:47:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:68 -> a
     48:48:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):58:58 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.r.a.f:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.t.a.f:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:52 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.r.a.e:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.t.a.e:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
     com.android.tools.r8.graph.DexType context -> b
@@ -20307,7 +20310,7 @@
     49:52:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
     53:53:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):148:148 -> a
     53:53:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):55 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.r.a.g:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.t.a.g:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -20339,7 +20342,7 @@
     53:53:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):105 -> a
     54:54:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):106:106 -> a
     55:57:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):122:124 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.r.a.h:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.t.a.h:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set knownNotToDependOnEnvironment -> d
     java.util.Set visited -> e
@@ -20379,14 +20382,14 @@
     71:77:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):122:128 -> d
     78:79:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:128 -> d
     80:82:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:129 -> d
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.r.a.i.a:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.t.a.i.a:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     boolean isBottom() -> c
     1:1:com.android.tools.r8.ir.analysis.constant.Bottom getInstance():13:13 -> g
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.r.a.i.b:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.t.a.i.b:
     com.android.tools.r8.ir.code.ConstNumber value -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ConstNumber):11:12 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
@@ -20395,7 +20398,7 @@
     1:1:com.android.tools.r8.ir.code.ConstNumber getConstNumber():47:47 -> g
     1:1:int getIntValue():51:51 -> h
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.r.a.i.c:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.t.a.i.c:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -20411,7 +20414,7 @@
     boolean isValueRange() -> f
     1:1:com.android.tools.r8.ir.code.Value getConstRange():44:44 -> g
     1:1:java.lang.String toString():40:40 -> toString
-com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.r.a.i.d:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.t.a.i.d:
     1:1:void <init>():6:6 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
@@ -20420,7 +20423,7 @@
     boolean isConst() -> d
     boolean isTop() -> e
     boolean isValueRange() -> f
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.r.a.i.e:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.t.a.i.e:
     java.util.Deque flowEdges -> d
     java.util.BitSet visitedBlocks -> g
     java.util.Map mapping -> b
@@ -20455,14 +20458,14 @@
     53:110:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):178:235 -> b
     53:110:void visitInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
     111:116:void setExecutableEdge(int,int):241:246 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.r.a.i.f:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.t.a.i.f:
     com.android.tools.r8.ir.analysis.constant.Top INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     boolean isTop() -> e
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> g
-com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.r.a.j.a:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.t.a.j.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType context -> b
     boolean $assertionsDisabled -> c
@@ -20495,7 +20498,7 @@
     1:1:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):151 -> c
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):174:174 -> c
     2:2:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):151 -> c
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.r.a.k.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.t.a.k.a:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -20524,8 +20527,8 @@
     102:102:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):212:212 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):55:63 -> b
     10:12:void addToWorklist(com.android.tools.r8.ir.code.Value):170:172 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.r.a.k.b:
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.r.a.l.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.t.a.k.b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.t.a.l.a:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -20539,7 +20542,7 @@
     51:62:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):70:81 -> a
     51:62:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     63:63:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.r.a.m.a:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.t.a.m.a:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -20549,7 +20552,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.r.a.m.b:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.t.a.m.b:
     java.util.Set fields -> a
     1:2:void <init>():18:19 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexEncodedField):22:23 -> <init>
@@ -20563,7 +20566,7 @@
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():74:74 -> hashCode
     1:1:int size():69:69 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.r.a.m.c:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.t.a.m.c:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -20572,7 +20575,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.r.a.m.d:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.t.a.m.d:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProgramClass clazz -> b
@@ -20646,21 +20649,21 @@
     178:178:java.util.LinkedList lambda$computeFieldOptimizationInfo$1(com.android.tools.r8.graph.DexEncodedField):123:123 -> a
     179:179:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$2(com.android.tools.r8.ir.code.BasicBlock):209:209 -> a
     1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():202:271 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.r.a.m.e:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.t.a.m.e:
     boolean isConcreteFieldSet() -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.r.a.m.f:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.t.a.m.f:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isTop() -> f
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.r.a.n.a:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.t.a.n.a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):21:43 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.r.a.o.c:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.t.a.o.c:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesWithRemovedExtensionFields -> c
@@ -20695,16 +20698,16 @@
     1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):154:154 -> b
     2:9:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):167:174 -> b
     1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):106:107 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.r.a.o.a:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.t.a.o.a:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):112:112 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):117:117 -> isReachableOrReferencedField
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$2 -> com.android.tools.r8.r.a.o.b:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$2 -> com.android.tools.r8.t.a.o.b:
     java.util.function.Predicate val$skip -> a
     java.util.Set val$remainingProtoExtensionFieldReads -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker,com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.Set):247:247 -> <init>
     1:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):251:252 -> registerStaticFieldRead
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.r.a.o.e:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.t.a.o.e:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences):27:28 -> <init>
     1:1:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BooleanSupplier):34:34 -> a
@@ -20715,7 +20718,7 @@
     4:4:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BooleanSupplier):34 -> a
     5:5:void addInliningHeuristicsForBuilderInlining(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set,java.util.Set):45:45 -> a
     6:15:void preprocessCallGraphBeforeCycleElimination(java.util.Map):49:58 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.r.a.o.d:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.t.a.o.d:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set alwaysInline -> c
@@ -20740,7 +20743,7 @@
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     3:3:void bypassClinitforInliningNewBuilderMethods():99 -> b
     4:10:void bypassClinitforInliningNewBuilderMethods():99:105 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.r.a.o.f:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.t.a.o.f:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement objectArrayType -> f
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -20847,7 +20850,7 @@
     66:66:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):75:75 -> a
     67:70:void forEachDynamicMethod(java.util.function.Consumer):82:85 -> a
     71:74:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):191:194 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.r.a.o.g:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.t.a.o.g:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -20855,7 +20858,7 @@
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():33:33 -> a
     1:4:boolean registerConstClass(com.android.tools.r8.graph.DexType):45:48 -> registerConstClass
     1:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):60:63 -> registerStaticFieldRead
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.r.a.o.h:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.t.a.o.h:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -20875,7 +20878,7 @@
     22:25:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):61:64 -> a
     22:25:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     26:26:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.r.a.o.i:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.t.a.o.i:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> j
     com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> h
     com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> i
@@ -20908,15 +20911,15 @@
     2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):103:103 -> b
     2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):107 -> b
     3:3:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):120:120 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.r.a.o.i$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.r.a.o.i$b:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.t.a.o.i$a:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.t.a.o.i$b:
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):148:148 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):153:157 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):155:162 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):160:160 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.r.a.o.i$c:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.t.a.o.i$c:
     com.android.tools.r8.graph.DexMethod isInitializedMethod -> c
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethod -> b
     com.android.tools.r8.graph.DexMethod createBuilderMethod -> a
@@ -20925,7 +20928,7 @@
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):131:138 -> <init>
     15:22:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):136:143 -> <init>
     23:23:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):141:141 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.r.a.o.i$d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.t.a.o.i$d:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -20935,7 +20938,7 @@
     com.android.tools.r8.graph.DexField getMemoizedIsInitializedField -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):167:167 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):177:194 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.r.a.o.j:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.t.a.o.j:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
@@ -20943,13 +20946,13 @@
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> f
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker generatedMessageLiteShrinker -> d
     1:18:void <init>(com.android.tools.r8.graph.AppView):20:37 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.r.a.o.k:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.t.a.o.k:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     boolean isProto2(int) -> a
     1:3:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
     1:3:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:26 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.r.a.o.m:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.t.a.o.m:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -20982,7 +20985,7 @@
     2:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):303:322 -> b
     22:22:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):315:315 -> b
     23:23:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):304:304 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.r.a.o.l:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.t.a.o.l:
     com.android.tools.r8.graph.DexString val$info -> b
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):257:259 -> <init>
@@ -20995,7 +20998,7 @@
     9:9:int nextInt():289:289 -> b
     10:10:int nextInt():278:278 -> b
     11:11:int nextInt():269:269 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.r.a.o.m$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.t.a.o.m$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -21010,10 +21013,10 @@
     16:16:java.lang.Object next():322 -> b
     17:17:com.android.tools.r8.ir.code.Value next():344:344 -> b
     17:17:java.lang.Object next():322 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.r.a.o.m$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.t.a.o.m$b:
     1:1:void <init>():367:367 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):367:367 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.r.a.o.n:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.t.a.o.n:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
     1:1:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):29:29 -> a
@@ -21026,14 +21029,14 @@
     55:70:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):81:96 -> a
     55:70:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):77 -> a
     1:12:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):100:111 -> b
-com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.r.a.o.o.a:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.t.a.o.o.a:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexType holder -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):20:22 -> <init>
     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
     boolean isDeadProtoFieldObject() -> e
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.r.a.o.o.b:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.t.a.o.o.b:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):23:24 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
@@ -21044,7 +21047,7 @@
     boolean isLiveProtoFieldObject() -> f
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> j
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.r.a.o.o.c:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.t.a.o.o.c:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -21106,7 +21109,7 @@
     88:88:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):228 -> b
     89:94:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):291:296 -> b
     89:94:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):246 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.r.a.o.o.d:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.t.a.o.o.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -21136,11 +21139,11 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():64:64 -> d
     1:1:boolean hasAuxData():42:42 -> e
     1:15:java.lang.String toString():190:204 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.r.a.o.o.e:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.t.a.o.o.e:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.r.a.o.o.f:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.t.a.o.o.f:
     boolean $assertionsDisabled -> e
     boolean isRequired -> b
     boolean needsIsInitializedCheck -> c
@@ -21168,11 +21171,11 @@
     1:1:boolean isValid():115:115 -> l
     1:1:boolean needsIsInitializedCheck():120:120 -> m
     1:8:int serialize():140:147 -> n
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.r.a.o.o.g:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.t.a.o.o.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     1:3:void <init>():10:12 -> <init>
     1:4:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):15:18 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.r.a.o.o.i:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.t.a.o.o.i:
     com.android.tools.r8.graph.DexEncodedMethod dynamicMethod -> a
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
@@ -21192,8 +21195,8 @@
     1:1:int numberOfHasBitsObjects():230:230 -> i
     1:1:int numberOfOneOfObjects():234:234 -> j
     1:9:java.lang.String toString():239:247 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.r.a.o.o.h:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.r.a.o.o.i$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.t.a.o.o.h:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.t.a.o.o.i$a:
     com.android.tools.r8.graph.DexEncodedMethod dynamicMethod -> a
     java.util.LinkedList hasBitsObjects -> d
     boolean $assertionsDisabled -> f
@@ -21215,7 +21218,7 @@
     49:86:void removeUnusedSharedData():128:165 -> c
     87:87:void removeUnusedSharedData():164:164 -> c
     88:89:void removeUnusedSharedData():83:84 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.r.a.o.o.j:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.t.a.o.o.j:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
     com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
@@ -21227,7 +21230,7 @@
     boolean isProtoFieldObject() -> g
     boolean isProtoObjectFromStaticGet() -> h
     boolean isProtoTypeObject() -> i
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.r.a.o.o.k:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.t.a.o.o.k:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:30 -> a
@@ -21235,7 +21238,7 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.r.a.o.o.l:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.t.a.o.o.l:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:32 -> a
@@ -21245,7 +21248,7 @@
     com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet() -> c
     boolean isProtoObjectFromStaticGet() -> h
     1:1:com.android.tools.r8.graph.DexField getField():25:25 -> j
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.r.a.o.o.m:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.t.a.o.o.m:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean):18:18 -> <init>
@@ -21258,7 +21261,7 @@
     boolean isRepeated() -> i
     boolean isSingular() -> k
     1:1:boolean isValid():52:52 -> l
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.r.a.o.o.n:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.t.a.o.o.n:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfCaseObject -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfObject -> a
     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>
@@ -21266,7 +21269,7 @@
     2:3:void forEach(java.util.function.Consumer):29:30 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject getOneOfObject():21:21 -> b
     1:1:java.util.stream.Stream stream():34:34 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.r.a.o.o.o:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.t.a.o.o.o:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
     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
@@ -21280,7 +21283,7 @@
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     boolean isProtoTypeObject() -> i
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> j
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.r.a.p.a:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.t.a.p.a:
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CANNOT_BE_POSTPONED -> a
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CAN_BE_POSTPONED -> b
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect NONE -> c
@@ -21683,7 +21686,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement getInstance():17:17 -> D
     1:1:int hashCode():42:42 -> hashCode
     boolean isWidePrimitive() -> z
-com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.r.a.q.a:
+com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.t.a.q.a:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> a
     com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> b
@@ -21694,7 +21697,7 @@
     boolean isSingleStringValue() -> g
     boolean isSingleValue() -> h
     boolean isUnknown() -> i
-com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.r.a.q.b:
+com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.t.a.q.b:
     java.util.concurrent.ConcurrentHashMap singleStringValues -> c
     java.util.concurrent.ConcurrentHashMap singleNumberValues -> b
     java.util.concurrent.ConcurrentHashMap singleEnumValues -> a
@@ -21702,7 +21705,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.SingleEnumValue createSingleEnumValue(com.android.tools.r8.graph.DexField):19:19 -> a
     2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):23:23 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):27:27 -> a
-com.android.tools.r8.ir.analysis.value.SingleEnumValue -> com.android.tools.r8.r.a.q.c:
+com.android.tools.r8.ir.analysis.value.SingleEnumValue -> com.android.tools.r8.t.a.q.c:
     com.android.tools.r8.graph.DexField field -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -21712,7 +21715,7 @@
     boolean isSingleEnumValue() -> e
     1:1:int hashCode():48:48 -> hashCode
     1:1:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.r.a.q.d:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.t.a.q.d:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -21725,7 +21728,7 @@
     1:1:int hashCode():53:53 -> hashCode
     1:2:boolean getBooleanValue():38:39 -> j
     1:1:java.lang.String toString():58:58 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.r.a.q.e:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.t.a.q.e:
     com.android.tools.r8.graph.DexString string -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -21739,14 +21742,14 @@
     1:1:int hashCode():53:53 -> hashCode
     1:1:com.android.tools.r8.graph.DexString getDexString():43:43 -> j
     1:1:java.lang.String toString():58:58 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.r.a.q.f:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.t.a.q.f:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> c
     boolean isNonTrivial() -> d
     boolean isSingleValue() -> h
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.r.a.q.g:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.t.a.q.g:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -21754,7 +21757,7 @@
     1:1:int hashCode():34:34 -> hashCode
     boolean isUnknown() -> i
     1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():14:14 -> j
-com.android.tools.r8.ir.code.Add -> com.android.tools.r8.r.b.a:
+com.android.tools.r8.ir.code.Add -> com.android.tools.r8.t.b.a:
     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):22:22 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -21777,7 +21780,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
     com.android.tools.r8.ir.code.Add asAdd() -> h
-com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.r.b.b:
+com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.t.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     1:1:int maxInValueRegister():56:56 -> C2
     int maxOutValueRegister() -> D2
@@ -21789,7 +21792,7 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.r.b.c:
+com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.t.b.c:
     1:1:void <init>():19:19 -> <init>
     1:1:int maxInValueRegister():54:54 -> C2
     1:1:int maxOutValueRegister():59:59 -> D2
@@ -21803,7 +21806,7 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.r.b.d:
+com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.t.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
@@ -21820,7 +21823,7 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.And -> com.android.tools.r8.r.b.e:
+com.android.tools.r8.ir.code.And -> com.android.tools.r8.t.b.e:
     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):19:19 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -21838,7 +21841,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
     com.android.tools.r8.ir.code.And asAnd() -> i
-com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.r.b.f:
+com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.t.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -21861,7 +21864,7 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.Argument asArgument() -> j
-com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.r.b.g:
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.t.b.g:
     boolean $assertionsDisabled -> i
     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>
@@ -21890,7 +21893,7 @@
     com.android.tools.r8.code.Instruction CreateLong2Addr(int,int) -> e
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> f
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> k
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.r.b.h:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.t.b.h:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():33:33 -> <clinit>
@@ -21970,7 +21973,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():66:66 -> e
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> l
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.r.b.i:
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.t.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     int maxInValueRegister() -> C2
     int maxOutValueRegister() -> D2
@@ -22000,7 +22003,7 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> m
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.r.b.j:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.t.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
@@ -22041,7 +22044,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():71:71 -> e
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> n
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.r.b.k:
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.t.b.k:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
@@ -22110,14 +22113,14 @@
     6:6:java.lang.String toString():307 -> toString
     7:16:java.lang.String toString():307:316 -> toString
     17:17:java.lang.String toString():304:304 -> toString
-com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.r.b.k$a:
-com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.r.b.k$b:
+com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.t.b.k$a:
+com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.t.b.k$b:
     1:1:void <init>():319:319 -> <init>
     boolean isAssumeDynamicType() -> a
     boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView) -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.r.b.k$c:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.t.b.k$c:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> b
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> a
     boolean $assertionsDisabled -> c
@@ -22134,7 +22137,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():371:371 -> e
     1:5:boolean equals(java.lang.Object):394:398 -> equals
     1:1:int hashCode():404:404 -> hashCode
-com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.r.b.k$d:
+com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.t.b.k$d:
     com.android.tools.r8.ir.code.Assume$NoAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:2:void <clinit>():338:339 -> <clinit>
@@ -22144,7 +22147,7 @@
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
     1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():344:344 -> d
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.r.b.k$e:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.t.b.k$e:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():408:410 -> <clinit>
@@ -22154,7 +22157,7 @@
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
     1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():415:415 -> d
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.r.b.l:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.t.b.l:
     int color -> n
     int estimatedPredecessorsCount -> l
     boolean $assertionsDisabled -> p
@@ -22408,7 +22411,7 @@
     1:1:java.util.List getPhis():531:531 -> x
     1:1:java.util.List getPredecessors():234:234 -> y
     1:1:java.util.List getSuccessors():188:188 -> z
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.r.b.l$a:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.t.b.l$a:
     com.android.tools.r8.ir.code.Instruction next -> b
     com.android.tools.r8.ir.code.Instruction val$instruction -> c
     com.android.tools.r8.ir.code.BasicBlock this$0 -> d
@@ -22420,14 +22423,14 @@
     1:5:java.lang.Object next():579 -> next
     6:6:com.android.tools.r8.ir.code.Instruction next():603:603 -> next
     6:6:java.lang.Object next():579 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.r.b.l$b:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.r.b.l$c:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.t.b.l$b:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.t.b.l$c:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> a
     1:3:void <clinit>():113:115 -> <clinit>
     1:1:void <init>(java.lang.String,int):112:112 -> <init>
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.r.b.l$d:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.t.b.l$d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1904:1904 -> <clinit>
     1:1:void <init>():1904:1904 -> <init>
@@ -22438,7 +22441,7 @@
     1:1:int doHash(java.lang.Object):1904:1904 -> doHash
     2:3:int doHash(com.android.tools.r8.ir.code.Phi):1919:1920 -> doHash
     2:3:int doHash(java.lang.Object):1904 -> doHash
-com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.r.b.l$e:
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.t.b.l$e:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():104:105 -> <clinit>
@@ -22446,7 +22449,7 @@
     1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.r.b.m:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.t.b.m:
     java.util.ListIterator instructionIterator -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):17:18 -> <init>
@@ -22457,7 +22460,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction next():43:43 -> next
     1:1:java.lang.Object next():9 -> next
     1:1:com.android.tools.r8.ir.code.Instruction previous():33:33 -> previous
-com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.r.b.n:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.t.b.n:
     com.android.tools.r8.ir.code.IRMetadata metadata -> e
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.Instruction current -> c
@@ -22584,7 +22587,7 @@
     1:1:void set(java.lang.Object):29:29 -> set
     2:5:void set(com.android.tools.r8.ir.code.Instruction):122:125 -> set
     2:5:void set(java.lang.Object):29 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.r.b.o:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.t.b.o:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.BasicBlock current -> c
@@ -22606,7 +22609,7 @@
     1:1:void set(java.lang.Object):9:9 -> set
     2:2:void set(com.android.tools.r8.ir.code.BasicBlock):64:64 -> set
     2:2:void set(java.lang.Object):9 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.r.b.p:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.t.b.p:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8: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):24:31 -> <init>
     1:1:int maxInValueRegister():90:90 -> C2
@@ -22618,7 +22621,7 @@
     boolean hasInvariantOutType() -> M0
     1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> M2
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1307:1307 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1310:1310 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -22635,7 +22638,7 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> r
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.r.b.q:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.t.b.q:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -22655,7 +22658,7 @@
     22:22:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):93 -> a
     23:32:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):94:103 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):50:50 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.r.b.r:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.t.b.r:
     java.util.List targets -> b
     java.util.List guards -> a
     java.util.Set uniqueTargets -> c
@@ -22685,18 +22688,18 @@
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:java.util.Iterator iterator():107:107 -> iterator
     1:2:int size():55:56 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.r.b.r$a:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.t.b.r$a:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):107:109 -> <init>
     1:1:boolean hasNext():113:113 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():118:121 -> next
     1:4:java.lang.Object next():107 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.r.b.r$b:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.t.b.r$b:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.lang.Object):24:26 -> <init>
-com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.r.b.s:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.t.b.s:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -22726,7 +22729,7 @@
     boolean isCheckCast() -> f1
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     1:1:java.lang.String toString():108:108 -> toString
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.r.b.t:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.t.b.t:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
@@ -22757,7 +22760,7 @@
     18:18:java.lang.String toString():117:117 -> toString
     19:20:java.lang.String toString():113:114 -> toString
     21:43:java.lang.String toString():109:131 -> toString
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.r.b.t$a:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.t.b.t$a:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
     com.android.tools.r8.ir.code.Cmp$Bias GT -> b
@@ -22766,7 +22769,7 @@
     2:2:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():28:28 -> a
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.r.b.u:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.t.b.u:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
@@ -22807,7 +22810,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():84:84 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.r.b.v:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.t.b.v:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> H0
     boolean hasInvariantOutType() -> M0
@@ -22817,7 +22820,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isConstInstruction() -> i1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.r.b.w:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.t.b.w:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -22847,7 +22850,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():95:95 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.r.b.x:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.t.b.x:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
@@ -22877,7 +22880,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():89:89 -> toString
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.r.b.y:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.t.b.y:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():33:33 -> <clinit>
@@ -22945,7 +22948,7 @@
     boolean isOutConstant() -> l2
     1:4:java.lang.String toString():252:255 -> toString
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.r.b.z:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.t.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
@@ -22982,7 +22985,7 @@
     boolean isConstString() -> m1
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.r.b.A:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.t.b.A:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:14:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:33 -> a
@@ -22998,7 +23001,7 @@
     22:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45 -> a
     23:27:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45:49 -> a
     28:36:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):48:56 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.r.b.B:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.t.b.B:
     1:1:void <init>():19:19 -> <init>
     1:1:int maxInValueRegister():59:59 -> C2
     1:1:int maxOutValueRegister():64:64 -> D2
@@ -23015,12 +23018,12 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isDebugLocalRead() -> q1
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.r.b.C:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.t.b.C:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> U0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean isDebugLocalUninitialized() -> r1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.r.b.D:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.t.b.D:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:30 -> <init>
@@ -23034,7 +23037,7 @@
     1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):81:82 -> b
     boolean isOutConstant() -> l2
     boolean isDebugLocalWrite() -> s1
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.r.b.E:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.t.b.E:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
@@ -23065,7 +23068,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isDebugLocalsChange() -> t1
     1:6:java.lang.String toString():92:97 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.r.b.F:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.t.b.F:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -23085,7 +23088,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isDebugPosition() -> u1
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.r.b.G:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.t.b.G:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
     java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke) -> a
@@ -23099,7 +23102,7 @@
     2:2:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):174:174 -> a
     3:3:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):309:309 -> a
     4:4:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):314:314 -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.r.b.H:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.t.b.H:
     com.android.tools.r8.graph.DexReference item -> h
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> j
@@ -23134,7 +23137,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():114:114 -> toString
     boolean isDexItemBasedConstString() -> v1
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.r.b.I:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.t.b.I:
     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):24:24 -> <init>
     com.android.tools.r8.ir.code.Div asDiv() -> E
     int opcode() -> E2
@@ -23159,7 +23162,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     boolean isDiv() -> w1
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.r.b.K:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.t.b.K:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -23192,7 +23195,7 @@
     1:2:void numberBlocks():236:237 -> d
     3:3:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):324:324 -> d
     1:9:java.lang.String toString():304:312 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.r.b.J:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.t.b.J:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock val$dominated -> b
     boolean $assertionsDisabled -> d
@@ -23202,17 +23205,17 @@
     1:1:boolean hasNext():197:197 -> hasNext
     1:9:com.android.tools.r8.ir.code.BasicBlock next():202:210 -> next
     1:9:java.lang.Object next():192 -> next
-com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.r.b.K$a:
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.t.b.K$a:
     com.android.tools.r8.ir.code.DominatorTree$Assumption MAY_HAVE_UNREACHABLE_BLOCKS -> b
     com.android.tools.r8.ir.code.DominatorTree$Assumption NO_UNREACHABLE_BLOCKS -> a
     1:2:void <clinit>():19:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.r.b.L:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.t.b.L:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive YES -> a
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
     1:2:void <clinit>():24:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.r.b.N:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.t.b.N:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <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):21:21 -> <init>
@@ -23239,7 +23242,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> x1
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.r.b.M:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.t.b.M:
     boolean $assertionsDisabled -> h
     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.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> <init>
@@ -23258,7 +23261,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> y1
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.r.b.O:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.t.b.O:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
     1:1:void <clinit>():27:27 -> <clinit>
@@ -23317,7 +23320,7 @@
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> e
     12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157 -> e
     13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):159:169 -> e
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.r.b.P:
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.t.b.P:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
     com.android.tools.r8.ir.code.FieldMemberType[] $VALUES -> j
     com.android.tools.r8.ir.code.FieldMemberType LONG -> h
@@ -23331,7 +23334,7 @@
     1:9:void <clinit>():12:20 -> <clinit>
     10:10:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.r.b.Q:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.t.b.Q:
     int register -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():11:11 -> <clinit>
@@ -23343,7 +23346,7 @@
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> e
     1:1:int getRegister():49:49 -> i0
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.r.b.S:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.t.b.S:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -23361,7 +23364,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.r.b.T:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.t.b.T:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     boolean $assertionsDisabled -> k
@@ -23570,10 +23573,10 @@
     34:34:boolean noColorsInUse():1182:1182 -> z
     34:34:void traceBlocks():431 -> z
     35:35:void traceBlocks():431:431 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.r.b.T$a:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.t.b.T$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):91:92 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.r.b.T$b:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.t.b.T$b:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
@@ -23582,7 +23585,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):64:68 -> <init>
     1:2:boolean equals(java.lang.Object):78:79 -> equals
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.r.b.U:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.t.b.U:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -23597,7 +23600,7 @@
     10:10:java.lang.Object next():10 -> next
     1:10:com.android.tools.r8.ir.code.Instruction previous():48:57 -> previous
     11:11:com.android.tools.r8.ir.code.Instruction previous():52:52 -> previous
-com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.r.b.V:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.t.b.V:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -23632,7 +23635,7 @@
     1:1:void set(java.lang.Object):17:17 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):146:146 -> set
     2:2:void set(java.lang.Object):17 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.r.b.W:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.t.b.W:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:27:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):24:50 -> a
@@ -23642,7 +23645,7 @@
     58:61:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):96:99 -> a
     1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):62:62 -> b
     2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):61:61 -> b
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.r.b.X:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.t.b.X:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -23753,7 +23756,7 @@
     1:1:boolean mayHaveMonitorInstruction():202:202 -> x
     1:1:boolean mayHaveMul():206:206 -> y
     1:1:boolean mayHaveOr():210:210 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.r.b.Y:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.t.b.Y:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.If$Type type -> i
     1:1:void <clinit>():20:20 -> <clinit>
@@ -23795,7 +23798,7 @@
     24:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.r.b.Y$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.t.b.Y$a:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
     com.android.tools.r8.ir.code.If$Type EQ -> a
@@ -23813,10 +23816,10 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> a
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> a
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> b
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.r.b.Z:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.t.b.Z:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> e
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.r.b.a0:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.t.b.a0:
     boolean $assertionsDisabled -> i
     int increment -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -23832,7 +23835,7 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.r.b.b0:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.t.b.b0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
@@ -23874,7 +23877,7 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():169:169 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.r.b.c0:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.t.b.c0:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):24:25 -> <init>
     int maxInValueRegister() -> C2
@@ -23897,7 +23900,7 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.r.b.d0:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.t.b.d0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
@@ -23934,7 +23937,7 @@
     1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:114 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():193:193 -> toString
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.r.b.e0:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.t.b.e0:
     java.util.List inValues -> b
     java.util.LinkedHashSet debugValues -> e
     boolean $assertionsDisabled -> g
@@ -24211,11 +24214,11 @@
     com.android.tools.r8.ir.code.Xor asXor() -> z0
     1:1:boolean isFieldGet():886:886 -> z1
     boolean isUnop() -> z2
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.r.b.f0:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.t.b.f0:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> b
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> f
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.r.b.g0:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.t.b.g0:
     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.DexType) -> a
     com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int) -> a
     com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions) -> a
@@ -24233,12 +24236,12 @@
     1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> b
     void removeOrReplaceByDebugLocalRead() -> e
     1:1:void removeInstructionIgnoreOutValue():44:44 -> g
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.r.b.h0:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.t.b.h0:
     boolean isPhi() -> b
     com.android.tools.r8.ir.code.Instruction asInstruction() -> d
     com.android.tools.r8.ir.code.Phi asPhi() -> f
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> g
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.r.b.i0:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.t.b.i0:
     boolean $assertionsDisabled -> m
     int[] keys -> l
     1:1:void <clinit>():27:27 -> <clinit>
@@ -24304,7 +24307,7 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.r.b.j0:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.t.b.j0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
@@ -24391,7 +24394,7 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.r.b.j0$a:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.t.b.j0$a:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
     com.android.tools.r8.ir.code.Invoke$Type MULTI_NEW_ARRAY -> g
     com.android.tools.r8.ir.code.Invoke$Type[] $VALUES -> j
@@ -24412,7 +24415,7 @@
     21:24:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
     25:25:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:42 -> a
     26:26:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:40 -> a
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.r.b.k0:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.t.b.k0:
     com.android.tools.r8.graph.DexCallSite callSite -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -24459,7 +24462,7 @@
     84:84:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.r.b.l0:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.t.b.l0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():32:32 -> <clinit>
@@ -24491,7 +24494,7 @@
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):133 -> f
     10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:140 -> f
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.r.b.m0:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.t.b.m0:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):26:26 -> <init>
@@ -24509,7 +24512,7 @@
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36 -> a
     1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:97 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:93 -> f
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.r.b.n0:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.t.b.n0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
     1:1:void <clinit>():31:31 -> <clinit>
@@ -24542,7 +24545,7 @@
     1:29:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):79:107 -> g
     30:43:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106:119 -> g
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.r.b.o0:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.t.b.o0:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
@@ -24555,7 +24558,7 @@
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
     1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):71:85 -> b
     16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> b
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.r.b.p0:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.t.b.p0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -24586,7 +24589,7 @@
     12:12:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeMultiNewArray):194:194 -> a
     12:12:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     1:4:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:120 -> b
-    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():252:252 -> b
+    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():259:259 -> b
     5:5:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120 -> b
     6:20:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:134 -> b
     21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
@@ -24594,7 +24597,7 @@
     22:36:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:154 -> b
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.r.b.q0:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.t.b.q0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -24620,7 +24623,7 @@
     26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     1:4:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:147 -> b
-    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():252:252 -> b
+    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():259:259 -> b
     5:5:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> b
     6:20:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147:161 -> b
     21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
@@ -24629,7 +24632,7 @@
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.r.b.r0:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.t.b.r0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():28:28 -> <clinit>
@@ -24661,7 +24664,7 @@
     43:43:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> g
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.r.b.s0:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.t.b.s0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
@@ -24687,7 +24690,7 @@
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):113 -> f
     10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:120 -> f
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.r.b.t0:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.t.b.t0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():22:22 -> <clinit>
@@ -24705,7 +24708,7 @@
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):214:214 -> a
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:101 -> f
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.r.b.u0:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.t.b.u0:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
@@ -24725,7 +24728,7 @@
     1:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):129:169 -> c
     1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> f
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.r.b.v0:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.t.b.v0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -24740,7 +24743,7 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):52 -> a
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):31:31 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.r.b.w0:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.t.b.w0:
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> b
@@ -24775,7 +24778,7 @@
     1:1:void set(java.lang.Object):15:15 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):202:202 -> set
     2:2:void set(java.lang.Object):15 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.r.b.x0:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.t.b.x0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     int maxInValueRegister() -> C2
     1:1:int maxOutValueRegister():61:61 -> D2
@@ -24794,7 +24797,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67 -> a
     com.android.tools.r8.ir.code.Load asLoad() -> a0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.r.b.y0:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.t.b.y0:
     boolean $assertionsDisabled -> i
     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>
@@ -24814,7 +24817,7 @@
     com.android.tools.r8.code.Instruction CreateLong2Addr(int,int) -> c
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> c
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.r.b.z0:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.t.b.z0:
     com.android.tools.r8.ir.code.MemberType CHAR -> c
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> b
     com.android.tools.r8.ir.code.MemberType INT -> e
@@ -24830,7 +24833,7 @@
     11:11:void <clinit>() -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
     1:1:boolean isPrecise():24:24 -> a
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.r.b.A0:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.t.b.A0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -24858,14 +24861,14 @@
     1:1:boolean isMonitorEnter():103 -> a2
     com.android.tools.r8.ir.code.Monitor asMonitor() -> c0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.r.b.A0$a:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.t.b.A0$a:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> b
     1:1:void <clinit>():25:25 -> <clinit>
     2:2:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.r.b.B0:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.t.b.B0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
@@ -24891,7 +24894,7 @@
     com.android.tools.r8.ir.code.Move asMove() -> d0
     1:1:boolean isOutConstant():81:81 -> l2
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.r.b.C0:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.t.b.C0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
@@ -24908,7 +24911,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1444:1444 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1447:1447 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
@@ -24920,7 +24923,7 @@
     boolean isMoveException() -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.MoveException asMoveException() -> e0
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.r.b.D0:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.t.b.D0:
     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):22:22 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -24943,7 +24946,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
     com.android.tools.r8.ir.code.Mul asMul() -> f0
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.r.b.E0:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.t.b.E0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -24962,7 +24965,7 @@
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean isNeg() -> e2
     com.android.tools.r8.ir.code.Neg asNeg() -> g0
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.r.b.F0:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.t.b.F0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -24992,7 +24995,7 @@
     boolean isNewArrayEmpty() -> f2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> h0
     1:1:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.r.b.G0:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.t.b.G0:
     long size -> i
     short[] data -> j
     boolean $assertionsDisabled -> k
@@ -25018,7 +25021,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isNewArrayFilledData() -> g2
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> i0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.r.b.H0:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.t.b.H0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
@@ -25058,9 +25061,9 @@
     boolean isNewInstance() -> h2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> j0
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.r.b.I0:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.t.b.I0:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> a
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.r.b.J0:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.t.b.J0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
@@ -25078,7 +25081,7 @@
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
     boolean isNot() -> i2
     com.android.tools.r8.ir.code.Not asNot() -> k0
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.r.b.K0:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.t.b.K0:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
     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):36:38 -> <init>
@@ -25108,7 +25111,7 @@
     248:248:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
     boolean isNumberConversion() -> j2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> l0
-com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.r.b.L0:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.t.b.L0:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
     com.android.tools.r8.ir.code.NumericType LONG -> e
@@ -25134,7 +25137,7 @@
     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.Or -> com.android.tools.r8.r.b.M0:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.t.b.M0:
     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):18:18 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -25152,7 +25155,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     boolean isOr() -> k2
     com.android.tools.r8.ir.code.Or asOr() -> m0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.r.b.N0:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.t.b.N0:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -25235,12 +25238,12 @@
     5:5:void removeDeadPhi():305 -> m0
     6:6:void removeDeadPhi():305:305 -> m0
     1:1:boolean removeTrivialPhi():233:233 -> n0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.r.b.N0$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.t.b.N0$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
     1:2:void <clinit>():37:38 -> <clinit>
     1:1:void <init>(java.lang.String,int):36:36 -> <init>
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.r.b.O0:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.t.b.O0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):19:19 -> <init>
     1:1:int maxInValueRegister():59:59 -> C2
     1:1:int maxOutValueRegister():64:64 -> D2
@@ -25260,7 +25263,7 @@
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isPop() -> m2
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.r.b.P0:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.t.b.P0:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> h
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -25288,7 +25291,7 @@
     1:5:int hashCode():134:138 -> hashCode
     1:19:java.lang.String toString(boolean):143:161 -> toString
     1:19:java.lang.String toString():166 -> toString
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.r.b.Q0:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.t.b.Q0:
     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):24:24 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -25313,7 +25316,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     com.android.tools.r8.ir.code.Rem asRem() -> n0
     boolean isRem() -> n2
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.r.b.R0:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.t.b.R0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -25337,7 +25340,7 @@
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     com.android.tools.r8.ir.code.Return asReturn() -> o0
     boolean isReturn() -> o2
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.r.b.S0:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.t.b.S0:
     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):17:17 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -25355,7 +25358,7 @@
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shl asShl() -> p0
     boolean isShl() -> p2
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.r.b.T0:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.t.b.T0:
     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):17:17 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -25373,9 +25376,9 @@
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shr asShr() -> q0
     boolean isShr() -> q2
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.r.b.U0:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.t.b.U0:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.r.b.V0:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.t.b.V0:
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
     boolean $assertionsDisabled -> t
@@ -25389,7 +25392,7 @@
     1:1:int getHeight():31:31 -> i0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> j0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.r.b.W0:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.t.b.W0:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
@@ -25400,7 +25403,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> i0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():59:59 -> w
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.r.b.X0:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.t.b.X0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
@@ -25445,7 +25448,7 @@
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> r0
     boolean isStaticGet() -> r2
     1:1:java.lang.String toString():179:179 -> toString
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.r.b.Y0:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.t.b.Y0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
@@ -25481,7 +25484,7 @@
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> s0
     boolean isStaticPut() -> s2
     1:1:java.lang.String toString():193:193 -> toString
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.r.b.Z0:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.t.b.Z0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
@@ -25504,7 +25507,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.Store asStore() -> t0
     boolean isStore() -> t2
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.r.b.a1:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.t.b.a1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -25528,7 +25531,7 @@
     6:11:java.lang.String toString():71:76 -> toString
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> u0
     boolean isStringSwitch() -> u2
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.r.b.b1:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.t.b.b1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <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):27:27 -> <init>
@@ -25561,7 +25564,7 @@
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
     com.android.tools.r8.ir.code.Sub asSub() -> v0
     boolean isSub() -> v2
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.r.b.c1:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.t.b.c1:
     boolean $assertionsDisabled -> h
     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,com.android.tools.r8.ir.code.Value):22:22 -> <init>
@@ -25580,7 +25583,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
     boolean isSwap() -> w2
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.r.b.d1:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.t.b.d1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
@@ -25606,7 +25609,7 @@
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> w0
     boolean isSwitch() -> x2
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.r.b.e1:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.t.b.e1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -25625,17 +25628,17 @@
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> x0
     boolean isThrow() -> y2
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.r.b.g1:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.t.b.g1:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice() -> a
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):15:15 -> a
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> c
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.r.b.f1:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.t.b.f1:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement val$type -> b
     com.android.tools.r8.graph.DebugLocalInfo val$local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():24:24 -> a
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():19:19 -> c
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.r.b.h1:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.t.b.h1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int maxInValueRegister() -> C2
     int maxOutValueRegister() -> D2
@@ -25647,7 +25650,7 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isUnop() -> z2
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.r.b.i1:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.t.b.i1:
     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):17:17 -> <init>
     boolean isUshr() -> A2
     int opcode() -> E2
@@ -25665,7 +25668,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> y0
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.r.b.j1:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.t.b.j1:
     int needsRegister -> j
     boolean isThis -> k
     boolean isArgument -> l
@@ -25844,12 +25847,12 @@
     1:11:com.android.tools.r8.utils.LongInterval getValueRange():996:1006 -> x
     1:1:boolean hasAliasedValue():253:253 -> y
     1:1:boolean hasAnyUsers():479:479 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.r.b.j1$a:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.t.b.j1$a:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):157:157 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):155:158 -> <init>
-com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.r.b.j1$b:
+com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.t.b.j1$b:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
     com.android.tools.r8.ir.code.Value$DebugUse LIVE -> a
@@ -25859,11 +25862,11 @@
     1:2:void <clinit>():165:166 -> <clinit>
     3:3:void <clinit>():165:165 -> <clinit>
     1:1:void <init>(java.lang.String,int):165:165 -> <init>
-com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.r.b.k1:
+com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.t.b.k1:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
     1:1:int next():10:10 -> a
-com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.r.b.l1:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.t.b.l1:
     com.android.tools.r8.ir.code.ValueType DOUBLE -> e
     com.android.tools.r8.ir.code.ValueType FLOAT -> c
     com.android.tools.r8.ir.code.ValueType LONG -> d
@@ -25893,7 +25896,7 @@
     40:55:com.android.tools.r8.ir.code.ValueType fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):106:121 -> a
     1:1:boolean isWide():29:29 -> b
     1:1:int requiredRegisters():33:33 -> c
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.r.b.m1:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.t.b.m1:
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> a
@@ -25927,9 +25930,9 @@
     58:82:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):133:157 -> a
     83:83:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):137:137 -> a
     1:1:int requiredRegisters():42:42 -> b
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.r.b.n1:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.t.b.n1:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.r.b.o1:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.t.b.o1:
     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):18:18 -> <init>
     boolean isXor() -> B2
     int opcode() -> E2
@@ -26163,7 +26166,7 @@
     56:56:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):163 -> a
     57:85:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):165:193 -> a
     86:89:java.util.Set lambda$processInvokeWithDynamicDispatch$0(boolean,com.android.tools.r8.graph.DexMethod):181:184 -> a
-    90:90:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):77:77 -> a
+    90:90:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):74:74 -> a
     90:90:java.util.Set lambda$processInvokeWithDynamicDispatch$0(boolean,com.android.tools.r8.graph.DexMethod):184 -> a
     91:92:void processFieldAccess(com.android.tools.r8.graph.DexField):201:202 -> a
     93:93:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> a
@@ -26664,7 +26667,7 @@
     1:1:int maxLocal():496:496 -> b
     1:1:java.lang.String toString():512:512 -> toString
 com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.ir.conversion.z:
-    void optimize(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.ir.conversion.MethodProcessor) -> a
+    void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
 com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.ir.conversion.K:
     boolean hasBackwardsBranch -> m
     boolean $assertionsDisabled -> o
@@ -26724,7 +26727,7 @@
     180:183:void reset():165:168 -> a
     180:183:com.android.tools.r8.graph.DexCode build():191 -> a
     184:225:com.android.tools.r8.graph.DexCode build():196:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1380:1380 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1383:1383 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:270:com.android.tools.r8.graph.DexCode build():238:281 -> a
     271:290:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):714:733 -> a
@@ -27311,7 +27314,7 @@
     345:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):623 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):623:623 -> a
     347:364:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):620:637 -> a
-    365:365:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1131:1131 -> a
+    365:365:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1134:1134 -> a
     365:365:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):637 -> a
     366:366:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):638:638 -> a
     367:378:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
@@ -28196,93 +28199,93 @@
     334:334:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1084 -> a
     335:335:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1084:1084 -> a
     336:348:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1083:1095 -> a
-    349:352:void optimize(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.ir.conversion.MethodProcessor):1104:1107 -> a
-    353:358:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1729:1734 -> a
-    353:358:void optimize(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.ir.conversion.MethodProcessor):1110 -> a
-    359:365:void optimize(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.ir.conversion.MethodProcessor):1111:1117 -> a
-    366:366:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1332:1332 -> a
-    366:366:void optimize(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.ir.conversion.MethodProcessor):1117 -> a
-    367:402:void optimize(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.ir.conversion.MethodProcessor):1118:1153 -> a
-    403:403:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482:1482 -> a
-    403:403:void optimize(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.ir.conversion.MethodProcessor):1154 -> a
+    349:352:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1103:1106 -> a
+    353:358:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1728:1733 -> a
+    353:358:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1109 -> a
+    359:365:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1110:1116 -> a
+    366:366:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1335:1335 -> a
+    366:366:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1116 -> a
+    367:402:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1117:1152 -> a
+    403:403:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1481:1481 -> a
+    403:403:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
     404:404:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    404:404:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482 -> a
-    404:404:void optimize(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.ir.conversion.MethodProcessor):1154 -> a
-    405:407:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482:1484 -> a
-    405:407:void optimize(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.ir.conversion.MethodProcessor):1154 -> a
+    404:404:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1481 -> a
+    404:404:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
+    405:407:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1481:1483 -> a
+    405:407:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
     408:408:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    408:408:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
-    408:408:void optimize(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.ir.conversion.MethodProcessor):1154 -> a
-    409:412:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1485:1488 -> a
-    409:412:void optimize(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.ir.conversion.MethodProcessor):1154 -> a
-    413:420:void optimize(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.ir.conversion.MethodProcessor):1162:1169 -> a
+    408:408:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1483 -> a
+    408:408:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
+    409:412:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1487 -> a
+    409:412:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
+    413:420:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1161:1168 -> a
     421:421:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):97:97 -> a
-    421:421:void optimize(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.ir.conversion.MethodProcessor):1170 -> a
-    422:521:void optimize(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.ir.conversion.MethodProcessor):1171:1270 -> a
+    421:421:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1169 -> a
+    422:521:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1170:1269 -> a
     522:524:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1048:1050 -> a
-    522:524:void optimize(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.ir.conversion.MethodProcessor):1271 -> a
-    525:533:void optimize(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.ir.conversion.MethodProcessor):1274:1282 -> a
-    534:570:void optimize(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.ir.conversion.MethodProcessor):1281:1317 -> a
-    571:634:void optimize(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.ir.conversion.MethodProcessor):1309:1372 -> a
+    522:524:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1270 -> a
+    525:533:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1273:1281 -> a
+    534:570:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1280:1316 -> a
+    571:634:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1308:1371 -> a
     635:635:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPrimary():20:20 -> a
-    635:635:void optimize(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.ir.conversion.MethodProcessor):1372 -> a
-    636:645:void optimize(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.ir.conversion.MethodProcessor):1373:1382 -> a
+    635:635:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1371 -> a
+    636:645:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1372:1381 -> a
     646:646:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    646:646:void optimize(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.ir.conversion.MethodProcessor):1382 -> a
-    647:657:void optimize(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.ir.conversion.MethodProcessor):1383:1393 -> a
-    658:663:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):905:910 -> a
-    658:663:void optimize(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.ir.conversion.MethodProcessor):1393 -> a
-    664:706:void optimize(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.ir.conversion.MethodProcessor):1394:1436 -> a
-    707:707:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1340:1340 -> a
-    707:707:void optimize(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.ir.conversion.MethodProcessor):1436 -> a
-    708:724:void optimize(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.ir.conversion.MethodProcessor):1437:1453 -> a
-    725:730:void optimize(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.ir.conversion.MethodProcessor):1452:1457 -> a
-    731:731:void lambda$optimize$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1191:1191 -> a
-    732:732:void lambda$optimize$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1195:1195 -> a
-    733:733:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1319:1319 -> a
-    734:739:void collectOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1463:1468 -> a
-    740:741:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1472:1473 -> a
+    646:646:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1381 -> a
+    647:657:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1382:1392 -> a
+    658:663:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):908:913 -> a
+    658:663:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1392 -> a
+    664:706:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1393:1435 -> a
+    707:707:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1343:1343 -> a
+    707:707:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1435 -> a
+    708:724:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1436:1452 -> a
+    725:730:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1451:1456 -> a
+    731:731:void lambda$optimize$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1190:1190 -> a
+    732:732:void lambda$optimize$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1194:1194 -> a
+    733:733:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1318:1318 -> a
+    734:739:void collectOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1462:1467 -> a
+    740:741:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1471:1472 -> a
     742:742:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    742:742:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1473 -> a
-    743:747:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1492:1496 -> a
-    743:747:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474 -> a
-    748:748:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476:1476 -> a
-    749:752:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1501:1504 -> a
-    749:752:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    753:757:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1528:1532 -> a
-    753:757:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    753:757:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    758:760:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1508 -> a
-    758:760:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
+    742:742:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1472 -> a
+    743:747:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1491:1495 -> a
+    743:747:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1473 -> a
+    748:748:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475:1475 -> a
+    749:752:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1500:1503 -> a
+    749:752:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    753:757:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1527:1531 -> a
+    753:757:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1504 -> a
+    753:757:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    758:760:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505:1507 -> a
+    758:760:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
     761:761:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1019:1019 -> a
-    761:761:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508 -> a
-    761:761:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    762:762:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1508 -> a
-    762:762:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    763:767:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507:1511 -> a
-    763:767:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
-    768:773:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1540:1545 -> a
-    774:774:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1365:1365 -> a
-    774:774:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
-    775:775:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546:1546 -> a
+    761:761:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
+    761:761:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    762:762:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507:1507 -> a
+    762:762:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    763:767:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1510 -> a
+    763:767:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    768:773:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1539:1544 -> a
+    774:774:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1368:1368 -> a
+    774:774:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1544 -> a
+    775:775:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545:1545 -> a
     776:788:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3719 -> a
-    776:788:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
+    776:788:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
     789:789:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     789:789:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720 -> a
-    789:789:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
+    789:789:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
     790:791:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720:3721 -> a
-    790:791:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
+    790:791:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
     792:792:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3707 -> a
-    792:792:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
-    793:802:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1557 -> a
-    803:803:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1556:1556 -> a
-    804:805:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1622:1623 -> a
-    806:806:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1621:1621 -> a
-    807:807:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1669:1669 -> a
-    808:808:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1745:1745 -> a
+    792:792:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
+    793:802:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547:1556 -> a
+    803:803:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1555:1555 -> a
+    804:805:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1621:1622 -> a
+    806:806:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1620:1620 -> a
+    807:807:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1668:1668 -> a
+    808:808:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1744:1744 -> a
     809:809:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    809:809:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1746 -> a
-    810:827:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1764 -> a
+    809:809:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1745 -> a
+    810:827:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1746:1763 -> a
     1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):493:498 -> b
     7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):496:507 -> b
     19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):549:558 -> b
@@ -28300,17 +28303,17 @@
     79:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:610 -> b
     87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> b
     87:87:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):610 -> b
-    88:92:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1528:1532 -> b
+    88:92:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1527:1531 -> b
     88:92:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):611 -> b
     93:95:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):756:758 -> b
     96:103:void optimizeSynthesizedLambdaClasses(java.util.Collection,java.util.concurrent.ExecutorService):987:994 -> b
     104:104:java.util.List getOptimizationsForPostIRProcessing():1029:1029 -> b
     105:112:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1057:1064 -> b
     113:113:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1062:1062 -> b
-    114:119:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1517:1522 -> b
-    120:124:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1520:1524 -> b
-    125:129:boolean lambda$workaroundForwardingInitializerBug$15(com.android.tools.r8.ir.code.Instruction):1585:1589 -> b
-    130:131:void printPhase(java.lang.String):1739:1740 -> b
+    114:119:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1516:1521 -> b
+    120:124:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1523 -> b
+    125:129:boolean lambda$workaroundForwardingInitializerBug$15(com.android.tools.r8.ir.code.Instruction):1584:1588 -> b
+    130:131:void printPhase(java.lang.String):1738:1739 -> b
     1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):520:539 -> c
     21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):538:544 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):129:142 -> c
@@ -28320,38 +28323,38 @@
     44:45:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexProgramClass):843:844 -> c
     46:49:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.DexEncodedMethod):881:884 -> c
     50:51:void processMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):1013:1014 -> c
-    52:52:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1614:1614 -> c
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1316:1316 -> c
-    53:53:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1614 -> c
-    54:65:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1617:1628 -> c
-    66:68:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1674:1676 -> c
-    66:68:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1629 -> c
-    69:69:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1632:1632 -> c
-    70:71:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1681:1682 -> c
-    70:71:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1633 -> c
-    72:73:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1686:1687 -> c
-    72:73:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1636 -> c
-    74:75:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1639:1640 -> c
-    76:80:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1660:1664 -> c
-    76:80:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641 -> c
-    81:86:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1642:1647 -> c
-    87:98:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1696:1707 -> c
-    87:98:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1648 -> c
+    52:52:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1613:1613 -> c
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1319:1319 -> c
+    53:53:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1613 -> c
+    54:65:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1627 -> c
+    66:68:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1673:1675 -> c
+    66:68:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1628 -> c
+    69:69:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631:1631 -> c
+    70:71:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1680:1681 -> c
+    70:71:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1632 -> c
+    72:73:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1685:1686 -> c
+    72:73:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> c
+    74:75:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638:1639 -> c
+    76:80:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1659:1663 -> c
+    76:80:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1640 -> c
+    81:86:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1646 -> c
+    87:98:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1695:1706 -> c
+    87:98:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1647 -> c
     1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):497:497 -> d
     2:6:com.android.tools.r8.graph.DexApplication optimize():618:622 -> d
     7:10:void waveStart(java.util.Collection,java.util.concurrent.ExecutorService):813:816 -> d
     11:11:void lambda$computeReachabilitySensitivity$7(com.android.tools.r8.graph.DexEncodedMethod):844:844 -> d
-    12:12:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1563:1563 -> d
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1353:1353 -> d
-    13:13:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1563 -> d
-    14:30:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1567:1583 -> d
-    31:34:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1713:1716 -> d
-    31:34:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
+    12:12:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1562:1562 -> d
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1356:1356 -> d
+    13:13:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1562 -> d
+    14:30:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1566:1582 -> d
+    31:34:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1712:1715 -> d
+    31:34:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1593 -> d
     35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> d
-    35:35:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716 -> d
-    35:35:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
-    36:44:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1717:1725 -> d
-    36:44:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
+    35:35:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715 -> d
+    35:35:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1593 -> d
+    36:44:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716:1724 -> d
+    36:44:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1593 -> d
     1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):536:536 -> e
     2:2:void clearDexMethodCompilationState():914:914 -> e
     1:7:boolean enableTryWithResourcesDesugaring():379:385 -> f
@@ -28448,13 +28451,13 @@
     505:521:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):410 -> a
     522:525:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):411:414 -> a
     526:531:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):591:596 -> a
-    532:532:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):646:646 -> a
-    533:539:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):650:656 -> a
-    540:540:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    540:540:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):656 -> a
-    541:541:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
-    541:541:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):661 -> a
-    542:545:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):664:667 -> a
+    532:533:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):646:647 -> a
+    534:540:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):651:657 -> a
+    541:541:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    541:541:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):657 -> a
+    542:542:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):98:98 -> a
+    542:542:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):662 -> a
+    543:546:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):665:668 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):365:365 -> b
 com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.Q:
     com.android.tools.r8.ir.code.Instruction current -> b
@@ -28463,10 +28466,10 @@
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():670:670 -> <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):678:682 -> <init>
-    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):687:700 -> a
-    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):697:697 -> a
+    1:1:void <clinit>():671:671 -> <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):679:683 -> <init>
+    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):688:701 -> a
+    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):698:698 -> a
 com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.ir.conversion.T:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
@@ -28825,7 +28828,7 @@
     196:208:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):222:234 -> a
     209:218:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):232:241 -> a
     219:221:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):279:281 -> a
-com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.r.c.a:
+com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.t.c.a:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):24:29 -> <init>
@@ -28861,7 +28864,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.descriptor():33:33 -> m
     1:1:boolean delegatingToConstructor():68 -> m
     2:2:boolean delegatingToConstructor():68:68 -> m
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.r.c.b:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.t.c.b:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set holders -> e
@@ -28996,7 +28999,7 @@
     261:273:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.lang.String):443:455 -> a
     274:292:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):459:477 -> a
     1:1:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):434:434 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.r.c.b$a:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.t.c.b$a:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():1746:1746 -> <clinit>
@@ -29005,7 +29008,7 @@
     1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1758:1759 -> a
     3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1769:1769 -> a
     4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1774:1774 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.r.c.b$b:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.t.c.b$b:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory factory -> b
     com.android.tools.r8.graph.DexMethod generatedMethod -> d
     java.lang.String methodName -> c
@@ -29016,16 +29019,16 @@
     3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1797:1797 -> a
     4:27:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1803:1826 -> a
     28:28:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1832:1832 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.r.c.b$c:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.t.c.b$c:
     void rewrite(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.r.c.b$d:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.t.c.b$d:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):1690:1691 -> <init>
     com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView) -> a
     boolean requiresGenerationOfCode() -> a
     void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RetargetCoreLibraryMethodProvider -> com.android.tools.r8.r.c.b$e:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RetargetCoreLibraryMethodProvider -> com.android.tools.r8.t.c.b$e:
     com.android.tools.r8.graph.DexType newHolder -> b
     com.android.tools.r8.graph.DexMethod targetMethod -> c
     boolean isStatic -> d
@@ -29035,7 +29038,7 @@
     3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1719:1719 -> a
     4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1725:1731 -> a
     11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1737:1737 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.r.c.b$f:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.t.c.b$f:
     java.util.Map rewritable -> a
     java.util.Map virtualRewrites -> b
     java.util.Set emulatedDispatchMethods -> c
@@ -29093,15 +29096,15 @@
     168:186:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1355:1373 -> h
     1:65:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1469:1533 -> i
     1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1597:1603 -> j
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.r.c.b$g:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.t.c.b$g:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType receiverType -> e
     1:1:void <clinit>():1844:1844 -> <clinit>
     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):1850:1851 -> <init>
     1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1856:1863 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.r.c.b$h:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.t.c.b$h:
     com.android.tools.r8.graph.Code create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.r.c.g:
+com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.t.c.g:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer newSynthesizedMethodConsumer -> d
@@ -29205,7 +29208,7 @@
     18:27:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):241:250 -> b
     18:27:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):477 -> b
     18:27:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):468 -> b
-com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.r.c.c:
+com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.t.c.c:
     com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo parent -> a
     com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo EMPTY -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardedMethodTargets -> b
@@ -29213,7 +29216,7 @@
     1:3:void <init>(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList):102:104 -> <init>
     1:3:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo create(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList):109:111 -> a
     4:5:boolean isTargetedByForwards(com.android.tools.r8.graph.DexEncodedMethod):119:120 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.r.c.d:
+com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.t.c.d:
     com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> c
     1:1:void <clinit>():155:155 -> <clinit>
     1:1:void <init>():158:158 -> <init>
@@ -29221,7 +29224,7 @@
     void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter) -> a
     1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):168 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.r.c.e:
+com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.t.c.e:
     java.util.Set signatures -> a
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures EMPTY -> b
     1:1:void <clinit>():51:51 -> <clinit>
@@ -29232,14 +29235,14 @@
     3:3:boolean isEmpty():84:84 -> a
     3:3:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):67 -> a
     4:6:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):70:72 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.r.c.f:
+com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.t.c.f:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):130:132 -> <init>
     1:5:com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):136:140 -> a
     6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):144:144 -> a
     7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):148:148 -> a
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.r.c.h:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.t.c.h:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
@@ -29299,7 +29302,7 @@
     156:156:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):248 -> a
     157:157:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):252:252 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):96:96 -> b
-com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.r.c.i:
+com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.t.c.i:
     boolean $assertionsDisabled -> i
     java.util.Map metNestHosts -> h
     1:1:void <clinit>():40:40 -> <clinit>
@@ -29333,7 +29336,7 @@
     80:80:boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List):151:151 -> a
     81:81:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):156:156 -> a
     82:82:void reportIncompleteNest(java.util.List):161:161 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.r.c.k:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.t.c.k:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -29346,8 +29349,8 @@
     9:9:void hideMatches(com.android.tools.r8.graph.DexMethod):68 -> a
     10:10:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     11:13:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():81:83 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.r.c.j:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.r.c.k$a:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.t.c.j:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.t.c.k$a:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> c
@@ -29357,7 +29360,7 @@
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):28:28 -> a
     2:4:com.android.tools.r8.graph.DexMethod getSingleCandidate(com.android.tools.r8.graph.DexMethod):46:48 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):28:28 -> b
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.r.c.l:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.t.c.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map callBackMethods -> d
@@ -29456,7 +29459,7 @@
     244:254:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):445:455 -> a
     255:255:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):454:454 -> a
     256:257:boolean canConvert(com.android.tools.r8.graph.DexType):463:464 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.r.c.m:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.t.c.m:
     java.util.Map rewritePrefix -> d
     java.util.List extraKeepRules -> j
     java.util.List dontRewriteInvocation -> i
@@ -29491,7 +29494,7 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():119:119 -> i
     1:1:boolean isLibraryCompilation():109:109 -> j
     1:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration empty():62:72 -> k
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.r.c.m$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.t.c.m$a:
     boolean $assertionsDisabled -> l
     java.util.Map customConversions -> i
     java.util.List dontRewriteInvocation -> j
@@ -29543,7 +29546,7 @@
     5:5:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> f
     5:5:int sharpIndex(java.lang.String,java.lang.String):261 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):261:261 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.r.c.n:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.t.c.n:
     int minAPILevel -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -29569,7 +29572,7 @@
     112:112:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):50:50 -> a
     113:115:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
     113:115:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):50 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.r.c.o:
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.t.c.o:
     java.util.Map typeWrappers -> b
     java.util.Map vivifiedTypeWrappers -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -29705,7 +29708,7 @@
     1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):145:145 -> c
     1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):125:125 -> d
     1:1:boolean isSynthesizedWrapper(com.android.tools.r8.graph.DexType):121:121 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.r.c.p:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.t.c.p:
     java.util.Set synthesizedMethods -> g
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -29716,348 +29719,349 @@
     java.util.Map emulatedInterfaces -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
     java.util.Map cache -> h
-    1:1:void <clinit>():92:92 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):134:134 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):105:140 -> <init>
-    1:6:void initializeEmulatedInterfaceVariables():144:149 -> a
+    1:1:void <clinit>():91:91 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):133:133 -> <init>
+    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):104:139 -> <init>
+    1:6:void initializeEmulatedInterfaceVariables():143:148 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    7:7:void initializeEmulatedInterfaceVariables():149 -> a
-    8:9:void initializeEmulatedInterfaceVariables():152:153 -> a
-    10:10:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:160 -> a
-    11:11:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
-    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161 -> a
-    12:14:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161:163 -> a
-    15:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):162:162 -> a
-    16:23:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:167 -> a
-    24:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):166:166 -> a
-    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):164:164 -> a
-    26:65:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):178:217 -> a
-    66:66:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):432:432 -> a
-    66:66:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):218 -> a
-    67:71:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):229:233 -> a
-    72:72:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):736:736 -> a
-    72:72:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234 -> a
-    73:73:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:235 -> a
-    74:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233:241 -> a
-    83:83:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242 -> a
-    84:84:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
-    84:84:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731 -> a
-    84:84:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242 -> a
-    85:85:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> a
-    85:85:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242 -> a
-    86:86:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:243 -> a
-    87:116:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241:270 -> a
-    117:118:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):763:764 -> a
-    117:118:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):269 -> a
-    119:119:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):271:271 -> a
-    120:120:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):775:775 -> a
-    120:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272 -> a
-    121:121:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):771:771 -> a
-    121:121:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):775 -> a
-    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272 -> a
-    122:122:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):273:273 -> a
-    123:138:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):271:286 -> a
+    7:7:void initializeEmulatedInterfaceVariables():148 -> a
+    8:9:void initializeEmulatedInterfaceVariables():151:152 -> a
+    10:10:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:159 -> a
+    11:11:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):694:694 -> a
+    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160 -> a
+    12:14:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:162 -> a
+    15:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161:161 -> a
+    16:23:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
+    24:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165:165 -> a
+    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
+    26:65:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:216 -> a
+    66:66:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):433:433 -> a
+    66:66:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):217 -> a
+    67:71:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):228:232 -> a
+    72:72:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):737:737 -> a
+    72:72:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    73:73:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
+    74:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
+    83:83:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):732:732 -> a
+    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    84:84:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):694:694 -> a
+    84:84:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):732 -> a
+    84:84:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    85:85:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):732:732 -> a
+    85:85:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    86:86:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    87:116:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:269 -> a
+    117:118:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):764:765 -> a
+    117:118:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268 -> a
+    119:119:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270:270 -> a
+    120:120:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):776:776 -> a
+    120:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):271 -> a
+    121:121:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):772:772 -> a
+    121:121:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):776 -> a
+    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):271 -> a
+    122:122:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
+    123:138:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270:285 -> a
     139:139:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    139:139:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    140:151:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):287:298 -> a
-    152:152:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
-    152:152:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):300 -> a
-    153:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):300:301 -> a
-    155:162:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):299:306 -> a
-    163:169:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:310 -> a
-    170:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):308:350 -> a
-    213:213:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):775:775 -> a
-    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351 -> a
-    214:214:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):771:771 -> a
-    214:214:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):775 -> a
-    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351 -> a
-    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352:352 -> a
-    216:225:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):350:359 -> a
-    226:226:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):785:785 -> a
-    226:226:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):360 -> a
-    227:227:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):781:781 -> a
-    227:227:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):785 -> a
-    227:227:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):360 -> a
-    228:228:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):361:361 -> a
-    229:229:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):359:359 -> a
-    230:232:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:335 -> a
+    139:139:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):285 -> a
+    140:151:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286:297 -> a
+    152:152:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):694:694 -> a
+    152:152:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):299 -> a
+    153:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):299:300 -> a
+    155:162:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):298:305 -> a
+    163:169:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):303:309 -> a
+    170:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):307:349 -> a
+    213:213:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):776:776 -> a
+    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):350 -> a
+    214:214:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):772:772 -> a
+    214:214:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):776 -> a
+    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):350 -> a
+    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351:351 -> a
+    216:225:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):349:358 -> a
+    226:226:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):786:786 -> a
+    226:226:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):359 -> a
+    227:227:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):782:782 -> a
+    227:227:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):786 -> a
+    227:227:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):359 -> a
+    228:228:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):360:360 -> a
+    229:229:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):358:358 -> a
+    230:232:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):332:334 -> a
     233:233:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     233:233:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    233:233:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335 -> a
-    234:268:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:369 -> a
-    269:269:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):420:420 -> a
-    269:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
+    233:233:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
+    234:268:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334:368 -> a
+    269:269:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):421:421 -> a
+    269:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
     270:270:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    270:270:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):420 -> a
-    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    271:273:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):420:422 -> a
-    271:273:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
+    270:270:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):421 -> a
+    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    271:273:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):421:423 -> a
+    271:273:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
     274:274:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
-    274:274:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):422 -> a
-    274:274:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    275:276:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):422:423 -> a
-    275:276:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    277:279:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):537:539 -> a
-    277:279:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):425 -> a
-    277:279:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    280:280:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):536:536 -> a
-    280:280:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):425 -> a
-    280:280:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    281:282:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):426:427 -> a
-    281:282:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    283:283:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):423:423 -> a
-    283:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):237:237 -> a
-    285:285:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):436:436 -> a
+    274:274:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):423 -> a
+    274:274:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    275:276:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):423:424 -> a
+    275:276:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    277:279:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):538:540 -> a
+    277:279:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):426 -> a
+    277:279:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    280:280:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):537:537 -> a
+    280:280:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):426 -> a
+    280:280:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    281:282:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):427:428 -> a
+    281:282:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    283:283:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):424:424 -> a
+    283:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
+    285:285:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):437:437 -> a
     286:286:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
-    286:286:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):436 -> a
-    287:291:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):436:440 -> a
-    292:297:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):495:500 -> a
+    286:286:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):437 -> a
+    287:291:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):437:441 -> a
+    292:297:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):496:501 -> a
     298:298:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    298:298:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):500 -> a
-    299:308:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):502:511 -> a
+    298:298:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):501 -> a
+    299:308:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):503:512 -> a
     309:309:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    309:309:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):511 -> a
-    310:310:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):513:513 -> a
-    311:316:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):544:549 -> a
-    317:323:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):548:554 -> a
-    324:324:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
-    324:324:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):556 -> a
-    325:325:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):556:556 -> a
-    326:344:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):555:573 -> a
+    309:309:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):512 -> a
+    310:310:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):514:514 -> a
+    311:316:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):545:550 -> a
+    317:323:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):549:555 -> a
+    324:324:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):694:694 -> a
+    324:324:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):557 -> a
+    325:325:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):557:557 -> a
+    326:344:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):556:574 -> a
     345:345:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    345:345:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):573 -> a
-    346:346:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574:574 -> a
-    347:353:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):520:526 -> a
-    347:353:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574 -> a
+    345:345:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574 -> a
+    346:346:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575:575 -> a
+    347:353:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):521:527 -> a
+    347:353:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575 -> a
     354:354:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    354:354:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):526 -> a
-    354:354:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574 -> a
-    355:355:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):528:528 -> a
-    355:355:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574 -> a
-    356:361:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575:580 -> a
-    362:362:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):578:578 -> a
-    363:377:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575:589 -> a
+    354:354:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    354:354:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575 -> a
+    355:355:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):529:529 -> a
+    355:355:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575 -> a
+    356:361:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):576:581 -> a
+    362:362:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):579:579 -> a
+    363:377:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):576:590 -> a
     378:378:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    378:378:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):589 -> a
-    379:381:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):590:592 -> a
+    378:378:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):590 -> a
+    379:381:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):591:593 -> a
     382:382:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
-    382:382:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):593 -> a
-    383:383:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):594:594 -> a
-    384:384:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
-    384:384:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):598 -> a
-    385:386:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):598:599 -> a
-    387:387:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):597:597 -> a
-    388:399:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):594:605 -> a
-    400:402:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):537:539 -> a
-    400:402:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):608 -> a
-    403:403:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):536:536 -> a
-    403:403:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):608 -> a
-    404:404:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):608:608 -> a
-    405:405:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):606:606 -> a
-    406:449:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):605:648 -> a
-    450:451:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):665:666 -> a
+    382:382:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):594 -> a
+    383:383:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):595:595 -> a
+    384:384:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):694:694 -> a
+    384:384:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):599 -> a
+    385:386:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):599:600 -> a
+    387:387:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):598:598 -> a
+    388:399:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):595:606 -> a
+    400:402:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):538:540 -> a
+    400:402:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):609 -> a
+    403:403:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):537:537 -> a
+    403:403:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):609 -> a
+    404:404:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):609:609 -> a
+    405:405:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):607:607 -> a
+    406:449:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):606:649 -> a
+    450:451:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):666:667 -> a
     452:452:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    452:452:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):666 -> a
-    453:457:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):670:674 -> a
-    458:458:java.lang.String getCompanionClassDescriptor(java.lang.String):681:681 -> a
-    459:462:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):686:689 -> a
-    463:467:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):698:702 -> a
-    468:477:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):747:756 -> a
-    478:478:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):753:753 -> a
-    479:479:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):771:771 -> a
-    480:480:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):775:775 -> a
-    481:481:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):771:771 -> a
-    481:481:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):775 -> a
-    482:484:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):836:838 -> a
-    485:485:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):915:915 -> a
+    452:452:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):667 -> a
+    453:457:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):671:675 -> a
+    458:458:java.lang.String getCompanionClassDescriptor(java.lang.String):682:682 -> a
+    459:462:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):687:690 -> a
+    463:467:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):699:703 -> a
+    468:477:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):748:757 -> a
+    478:478:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):754:754 -> a
+    479:479:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):772:772 -> a
+    480:480:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):776:776 -> a
+    481:481:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):772:772 -> a
+    481:481:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):776 -> a
+    482:484:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):837:839 -> a
+    485:485:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916:916 -> a
     486:486:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
-    486:486:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):915 -> a
-    487:490:java.util.Map processEmulatedInterfaceHierarchy():483:486 -> a
-    487:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):464 -> a
-    487:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
-    491:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):465:466 -> a
-    491:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
+    486:486:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
+    487:490:java.util.Map processEmulatedInterfaceHierarchy():484:487 -> a
+    487:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):465 -> a
+    487:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):917 -> a
+    491:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):466:467 -> a
+    491:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):917 -> a
     493:493:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    493:493:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):466 -> a
-    493:493:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
-    494:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):468:472 -> a
-    494:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
-    499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):471:471 -> a
-    499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
-    500:500:boolean isInMainDexList(com.android.tools.r8.graph.DexType):725:725 -> a
-    500:500:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):474 -> a
-    500:500:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
-    501:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):474:475 -> a
-    501:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
-    503:513:void duplicateEmulatedInterfaces():846:856 -> a
-    503:513:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
+    493:493:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):467 -> a
+    493:493:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):917 -> a
+    494:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):469:473 -> a
+    494:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):917 -> a
+    499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):472:472 -> a
+    499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):917 -> a
+    500:500:boolean isInMainDexList(com.android.tools.r8.graph.DexType):726:726 -> a
+    500:500:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    500:500:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):917 -> a
+    501:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):475:476 -> a
+    501:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):917 -> a
+    503:513:void duplicateEmulatedInterfaces():847:857 -> a
+    503:513:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
     514:514:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
-    514:514:void duplicateEmulatedInterfaces():856 -> a
-    514:514:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    515:516:void duplicateEmulatedInterfaces():857:858 -> a
-    515:516:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
+    514:514:void duplicateEmulatedInterfaces():857 -> a
+    514:514:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
+    515:516:void duplicateEmulatedInterfaces():858:859 -> a
+    515:516:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
     517:517:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    517:517:void duplicateEmulatedInterfaces():858 -> a
-    517:517:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    518:518:void duplicateEmulatedInterfaces():859:859 -> a
-    518:518:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    519:527:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):881:889 -> a
-    519:527:void duplicateEmulatedInterfaces():860 -> a
-    519:527:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
+    517:517:void duplicateEmulatedInterfaces():859 -> a
+    517:517:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
+    518:518:void duplicateEmulatedInterfaces():860:860 -> a
+    518:518:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
+    519:527:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):882:890 -> a
+    519:527:void duplicateEmulatedInterfaces():861 -> a
+    519:527:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
     528:528:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    528:528:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):889 -> a
-    528:528:void duplicateEmulatedInterfaces():860 -> a
-    528:528:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    529:536:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):891:898 -> a
-    529:536:void duplicateEmulatedInterfaces():860 -> a
-    529:536:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    537:547:void duplicateEmulatedInterfaces():861:871 -> a
-    537:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    548:553:void duplicateEmulatedInterfaces():870:875 -> a
-    548:553:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    554:554:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):922:922 -> a
-    555:557:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):978:980 -> a
-    555:557:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):922 -> a
-    558:559:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):955:956 -> a
-    558:559:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):981 -> a
-    558:559:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):922 -> a
-    560:564:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):982:986 -> a
-    560:564:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):922 -> a
-    565:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):928:928 -> a
-    566:568:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):960:962 -> a
-    566:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):929 -> a
-    569:570:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):955:956 -> a
-    569:570:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):963 -> a
-    569:570:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):929 -> a
-    571:580:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):964:973 -> a
-    571:580:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):929 -> a
-    581:585:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):929:933 -> a
-    586:586:boolean isInMainDexList(com.android.tools.r8.graph.DexType):725:725 -> a
-    586:586:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933 -> a
-    587:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933:937 -> a
+    528:528:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):890 -> a
+    528:528:void duplicateEmulatedInterfaces():861 -> a
+    528:528:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
+    529:536:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):892:899 -> a
+    529:536:void duplicateEmulatedInterfaces():861 -> a
+    529:536:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
+    537:547:void duplicateEmulatedInterfaces():862:872 -> a
+    537:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
+    548:553:void duplicateEmulatedInterfaces():871:876 -> a
+    548:553:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):919 -> a
+    554:554:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):923:923 -> a
+    555:557:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):979:981 -> a
+    555:557:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):923 -> a
+    558:559:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):956:957 -> a
+    558:559:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):982 -> a
+    558:559:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):923 -> a
+    560:564:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):983:987 -> a
+    560:564:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):923 -> a
+    565:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):929:929 -> a
+    566:568:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):961:963 -> a
+    566:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):930 -> a
+    569:570:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):956:957 -> a
+    569:570:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):964 -> a
+    569:570:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):930 -> a
+    571:580:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):965:974 -> a
+    571:580:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):930 -> a
+    581:585:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):930:934 -> a
+    586:586:boolean isInMainDexList(com.android.tools.r8.graph.DexType):726:726 -> a
+    586:586:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):934 -> a
+    587:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):934:938 -> a
     592:592:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
-    592:592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):937 -> a
-    593:594:void renameEmulatedInterfaces():791:792 -> a
-    593:594:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    595:603:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):804:812 -> a
-    595:603:void renameEmulatedInterfaces():793 -> a
-    595:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    604:607:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):823:826 -> a
-    604:607:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):812 -> a
-    604:607:void renameEmulatedInterfaces():793 -> a
-    604:607:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    608:608:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):814:814 -> a
-    608:608:void renameEmulatedInterfaces():793 -> a
-    608:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
+    592:592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
+    593:594:void renameEmulatedInterfaces():792:793 -> a
+    593:594:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
+    595:603:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):805:813 -> a
+    595:603:void renameEmulatedInterfaces():794 -> a
+    595:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
+    604:607:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):824:827 -> a
+    604:607:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):813 -> a
+    604:607:void renameEmulatedInterfaces():794 -> a
+    604:607:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
+    608:608:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):815:815 -> a
+    608:608:void renameEmulatedInterfaces():794 -> a
+    608:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
     609:609:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    609:609:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):814 -> a
-    609:609:void renameEmulatedInterfaces():793 -> a
-    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    610:610:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):816:816 -> a
-    610:610:void renameEmulatedInterfaces():793 -> a
-    610:610:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    611:613:void renameEmulatedInterfaces():794:796 -> a
-    611:613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    614:616:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):830:832 -> a
-    614:616:void renameEmulatedInterfaces():797 -> a
-    614:616:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    617:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):941:941 -> a
-    618:620:void clear():948:950 -> a
-    618:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):944 -> a
-    621:635:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):990:1004 -> a
-    636:636:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):997:997 -> a
-    637:648:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1012:1023 -> a
+    609:609:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):815 -> a
+    609:609:void renameEmulatedInterfaces():794 -> a
+    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
+    610:610:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):817:817 -> a
+    610:610:void renameEmulatedInterfaces():794 -> a
+    610:610:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
+    611:613:void renameEmulatedInterfaces():795:797 -> a
+    611:613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
+    614:616:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):831:833 -> a
+    614:616:void renameEmulatedInterfaces():798 -> a
+    614:616:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):939 -> a
+    617:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):942:942 -> a
+    618:620:void clear():949:951 -> a
+    618:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):945 -> a
+    621:635:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):991:1005 -> a
+    636:636:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):998:998 -> a
+    637:648:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1013:1024 -> a
     649:649:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    649:649:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1024 -> a
-    650:659:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1025:1034 -> a
-    660:660:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1052:1052 -> a
+    649:649:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1025 -> a
+    650:659:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1026:1035 -> a
+    660:660:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1053:1053 -> a
     661:661:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
-    661:661:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1052 -> a
-    662:662:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1053:1053 -> a
-    663:663:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):707:707 -> a
-    663:663:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1054 -> a
-    664:676:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1054:1066 -> a
-    677:677:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1082:1082 -> a
-    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1095:1096 -> a
-    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
+    661:661:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1053 -> a
+    662:662:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1054:1054 -> a
+    663:663:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):708:708 -> a
+    663:663:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1055 -> a
+    664:676:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1055:1067 -> a
+    677:677:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1083:1083 -> a
+    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1096:1097 -> a
+    678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
     680:680:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1096 -> a
-    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
-    681:682:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1044:1045 -> a
-    681:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1098 -> a
-    681:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
-    683:685:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1099:1101 -> a
-    683:685:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
-    686:686:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):432:432 -> a
-    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1107 -> a
-    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
-    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1112:1138 -> a
-    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
-    714:714:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087:1087 -> a
-    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1104 -> a
-    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
+    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
+    681:682:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1045:1046 -> a
+    681:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1099 -> a
+    681:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
+    683:685:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1100:1102 -> a
+    683:685:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
+    686:686:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):433:433 -> a
+    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1108 -> a
+    686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
+    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1113:1139 -> a
+    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
+    714:714:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088:1088 -> a
+    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1103:1105 -> a
+    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
     718:718:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1104 -> a
-    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
-    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1104:1104 -> a
-    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
-    720:721:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1143:1144 -> a
+    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1105 -> a
+    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
+    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1105:1105 -> a
+    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1087 -> a
+    720:721:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1144:1145 -> a
     722:722:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
-    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1146 -> a
-    723:723:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
-    723:723:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1147 -> a
-    724:724:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1149:1149 -> a
-    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):172:172 -> b
-    2:3:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):445:446 -> b
-    4:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):658:659 -> b
-    6:6:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):652:652 -> b
-    6:6:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):660 -> b
-    7:7:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):661:661 -> b
-    8:9:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1044:1045 -> b
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):707:707 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717:717 -> c
-    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):707:707 -> c
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717 -> c
-    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717:720 -> c
-    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):719:721 -> c
-    11:11:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):785:785 -> c
-    12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):781:781 -> c
-    12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):785 -> c
-    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):454:459 -> d
-    7:7:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> d
-    8:8:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> d
-    8:8:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731 -> d
-    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> d
-    1:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1070:1071 -> e
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):712:712 -> e
-    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1072 -> e
-    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074:1074 -> e
+    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1147 -> a
+    723:727:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1148:1152 -> a
+    728:728:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
+    728:728:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1153 -> a
+    729:729:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1155:1155 -> a
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> b
+    2:3:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):446:447 -> b
+    4:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):659:660 -> b
+    6:6:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):653:653 -> b
+    6:6:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):661 -> b
+    7:7:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):662:662 -> b
+    8:9:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1045:1046 -> b
+    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):708:708 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):718:718 -> c
+    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):708:708 -> c
+    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):718 -> c
+    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):718:721 -> c
+    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):720:722 -> c
+    11:11:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):786:786 -> c
+    12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):782:782 -> c
+    12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):786 -> c
+    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):455:460 -> d
+    7:7:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):732:732 -> d
+    8:8:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):694:694 -> d
+    8:8:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):732 -> d
+    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):732:732 -> d
+    1:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1071:1072 -> e
+    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):713:713 -> e
+    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1073 -> e
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075:1075 -> e
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> e
-    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074 -> e
-    6:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075:1075 -> e
+    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075 -> e
+    6:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1076:1076 -> e
     7:7:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> e
-    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075 -> e
-    1:4:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):381:384 -> f
+    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1076 -> e
+    1:4:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):380:383 -> f
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
-    5:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):384 -> f
-    6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):392:392 -> f
+    5:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):383 -> f
+    6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):391:391 -> f
     7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> f
-    7:7:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):392 -> f
-    8:24:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):392:408 -> f
-    25:25:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> f
-    25:25:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):409 -> f
-    26:26:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):409:409 -> f
-    27:27:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):172:172 -> f
-    27:27:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):409 -> f
-    28:28:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):410:410 -> f
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.r.c.p$a:
+    7:7:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):391 -> f
+    8:20:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):391:403 -> f
+    21:21:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> f
+    21:21:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):410 -> f
+    22:22:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):410:410 -> f
+    23:23:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> f
+    23:23:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):410 -> f
+    24:24:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):411:411 -> f
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.t.c.p$a:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
-    1:5:void <clinit>():127:131 -> <clinit>
-    1:1:void <init>(java.lang.String,int):123:123 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.r.c.r:
+    1:5:void <clinit>():126:130 -> <clinit>
+    1:1:void <init>(java.lang.String,int):122:122 -> <init>
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.t.c.r:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
@@ -30106,24 +30110,24 @@
     141:141:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):352:352 -> a
     141:141:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
     142:160:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):160:178 -> a
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):694:694 -> a
     161:161:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):178 -> a
     162:183:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):179:200 -> a
     184:188:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):204:208 -> a
     189:213:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):212:236 -> a
-    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):736:736 -> a
+    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):737:737 -> a
     214:214:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):236 -> a
     215:229:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):238:252 -> a
     230:283:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):229:282 -> a
     284:288:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):342:346 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense -> com.android.tools.r8.r.c.r$a:
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense -> com.android.tools.r8.t.c.r$a:
     1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):369:369 -> <init>
     1:1:com.android.tools.r8.graph.GraphLense$Builder builder():385:385 -> b
     1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):381:381 -> mapInvocationType
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense$Builder -> com.android.tools.r8.r.c.q:
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense$Builder -> com.android.tools.r8.t.c.q:
     1:1:void <init>():388:388 -> <init>
     1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):391:394 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.r.c.s:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.t.c.s:
     com.android.tools.r8.graph.DexMethod mainMethod -> o
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):23:24 -> <init>
     1:1:void lambda$prepareInstructions$0(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
@@ -30135,7 +30139,7 @@
     2:2:void prepareInstructions():30 -> h
     3:18:void prepareInstructions():30:45 -> h
     19:46:void prepareInstructions():44:71 -> h
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSynthesizedCode -> com.android.tools.r8.r.c.t:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSynthesizedCode -> com.android.tools.r8.t.c.t:
     com.android.tools.r8.graph.DexMethod bridgeMethod -> f
     com.android.tools.r8.graph.DexMethod mainMethod -> e
     1:3:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):19:21 -> <init>
@@ -30146,7 +30150,7 @@
     7:8:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):38:39 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():26:26 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.r.c.A:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.t.c.A:
     java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> h
     com.android.tools.r8.graph.DexField lambdaField -> f
     com.android.tools.r8.ir.desugar.LambdaClass$Target target -> g
@@ -30214,7 +30218,7 @@
     72:98:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):210:236 -> d
     72:98:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():157 -> d
     99:108:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():157:166 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.r.c.u:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.t.c.u:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():643:643 -> <clinit>
@@ -30225,14 +30229,14 @@
     3:26:void ensureAccessibility():653:676 -> a
     27:27:void ensureAccessibility():674:674 -> a
     28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):669:669 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.r.c.v:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.t.c.v:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):603:604 -> <init>
     1:6:void ensureAccessibility():611:616 -> a
     7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
     7:7:void ensureAccessibility():617 -> a
     8:22:void ensureAccessibility():620:634 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.r.c.w:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.t.c.w:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():554:554 -> <clinit>
@@ -30242,16 +30246,16 @@
     7:7:void ensureAccessibility():570 -> a
     8:25:void ensureAccessibility():573:590 -> a
     26:33:void ensureAccessibility():589:596 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.r.c.x:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.t.c.x:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):526:526 -> <init>
     void ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.r.c.y:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.t.c.y:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():534:534 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):536:537 -> <init>
     1:5:void ensureAccessibility():543:547 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.r.c.z:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.t.c.z:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -30260,7 +30264,7 @@
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):479:483 -> <init>
     void ensureAccessibility() -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):490:490 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.r.c.B:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.t.c.B:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:19 -> <init>
@@ -30269,13 +30273,13 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> h
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSynthesizedCode -> com.android.tools.r8.r.c.C:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSynthesizedCode -> com.android.tools.r8.t.c.C:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):13:13 -> <init>
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):18:18 -> a
     2:4:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):24:26 -> a
     1:1:java.util.function.Consumer getRegistryCallback():23:23 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():18:18 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.r.c.D:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.t.c.D:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
@@ -30285,13 +30289,13 @@
     1:8:boolean equals(java.lang.Object):63:70 -> equals
     1:25:void prepareInstructions():25:49 -> h
     1:2:int hashCode():57:58 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaConstructorSynthesizedCode -> com.android.tools.r8.r.c.E:
+com.android.tools.r8.ir.desugar.LambdaConstructorSynthesizedCode -> com.android.tools.r8.t.c.E:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):14:14 -> <init>
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):19:19 -> a
     2:5:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):25:28 -> a
     1:1:java.util.function.Consumer getRegistryCallback():24:24 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():19:19 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.r.c.F:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.t.c.F:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -30339,7 +30343,7 @@
     95:96:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):267:268 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):225:226 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.r.c.G:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.t.c.G:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):28:28 -> <init>
@@ -30421,7 +30425,7 @@
     80:81:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> h
     80:81:void prepareInstructions():222 -> h
     82:112:void prepareInstructions():222:252 -> h
-com.android.tools.r8.ir.desugar.LambdaMainMethodSynthesizedCode -> com.android.tools.r8.r.c.H:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSynthesizedCode -> com.android.tools.r8.t.c.H:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod mainMethod -> e
     1:1:void <clinit>():14:14 -> <clinit>
@@ -30433,7 +30437,7 @@
     32:32:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):46:46 -> a
     1:1:java.util.function.Consumer getRegistryCallback():30:30 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():25:25 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.r.c.J:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.t.c.J:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
@@ -30526,7 +30530,7 @@
     238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):339:339 -> a
     239:241:java.lang.Object getKnown(java.util.Map,java.lang.Object):364:366 -> a
     1:3:java.util.Set getDesugaredCallSites():285:287 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.r.c.I:
+com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.t.c.I:
     com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> a
     java.util.function.Consumer val$consumer -> c
     com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> d
@@ -30534,13 +30538,13 @@
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):163:163 -> <init>
     1:6:void registerCallSite(com.android.tools.r8.graph.DexCallSite):167:172 -> registerCallSite
     7:7:void registerCallSite(com.android.tools.r8.graph.DexCallSite):170:170 -> registerCallSite
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.r.c.K:
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.t.c.K:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> mapInvocationType
-com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.r.c.L:
+com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.t.c.L:
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
@@ -30548,7 +30552,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():28:28 -> a
     1:1:com.android.tools.r8.graph.DexType[] captures():32 -> a
     2:4:com.android.tools.r8.graph.DexType[] captures():32:34 -> a
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.r.c.M:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.t.c.M:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -30556,133 +30560,138 @@
     boolean nestConstructorUsed -> f
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexProgramClass nestConstructor -> e
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):65:65 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView):58:67 -> <init>
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):66:66 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView):59:68 -> <init>
     void reportIncompleteNest(java.util.List) -> a
     void reportMissingNestHost(com.android.tools.r8.graph.DexClass) -> a
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
-    1:1:com.android.tools.r8.graph.DexType getNestConstructorType():71:71 -> a
-    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):79:79 -> a
+    1:1:com.android.tools.r8.graph.DexType getNestConstructorType():72:72 -> a
+    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):80:80 -> a
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):79 -> a
-    4:4:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):112:112 -> a
-    5:7:void synthesizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):172:174 -> a
-    8:15:boolean invokeRequiresRewriting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):245:252 -> a
-    16:23:boolean fieldAccessRequiresRewriting(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):256:263 -> a
-    24:25:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):283:284 -> a
-    26:27:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):226:227 -> a
-    26:27:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
+    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):80 -> a
+    4:4:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):113:113 -> a
+    5:7:void synthesizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):186:188 -> a
+    8:15:boolean invokeRequiresRewriting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):259:266 -> a
+    16:23:boolean fieldAccessRequiresRewriting(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):270:277 -> a
+    24:25:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):297:298 -> a
+    26:27:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):240:241 -> a
+    26:27:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
     28:28:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> a
-    28:28:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):229 -> a
-    28:28:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
-    29:32:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):229:232 -> a
-    29:32:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
+    28:28:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):243 -> a
+    28:28:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
+    29:32:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):243:246 -> a
+    29:32:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
     33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> a
-    33:33:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):234 -> a
-    33:33:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
-    34:39:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):235:240 -> a
-    34:39:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
-    40:40:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):194:194 -> a
-    40:40:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):241 -> a
-    40:40:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
+    33:33:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):248 -> a
+    33:33:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
+    34:39:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):249:254 -> a
+    34:39:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
+    40:40:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):208:208 -> a
+    40:40:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255 -> a
+    40:40:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
     41:41:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> a
-    41:41:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):196 -> a
-    41:41:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):241 -> a
-    41:41:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
-    42:44:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):197:199 -> a
-    42:44:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):241 -> a
-    42:44:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
+    41:41:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):210 -> a
+    41:41:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255 -> a
+    41:41:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
+    42:44:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):211:213 -> a
+    42:44:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255 -> a
+    42:44:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
     45:45:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> a
-    45:45:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):200 -> a
-    45:45:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):241 -> a
-    45:45:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
-    46:50:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):201:205 -> a
-    46:50:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):241 -> a
-    46:50:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
-    51:51:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):241:241 -> a
-    51:51:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):285 -> a
-    52:58:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):286:292 -> a
-    59:59:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureFieldAccessBridge$1(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):295:295 -> a
-    60:65:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):302:307 -> a
-    66:67:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220:221 -> a
-    66:67:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
+    45:45:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):214 -> a
+    45:45:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255 -> a
+    45:45:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
+    46:50:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):215:219 -> a
+    46:50:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255 -> a
+    46:50:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
+    51:51:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):255:255 -> a
+    51:51:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):299 -> a
+    52:58:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):300:306 -> a
+    59:59:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureFieldAccessBridge$1(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):309:309 -> a
+    60:65:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):316:321 -> a
+    66:67:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):234:235 -> a
+    66:67:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):321 -> a
     68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1309:1311 -> a
-    68:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221 -> a
-    68:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
+    68:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):235 -> a
+    68:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):321 -> a
     71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1310:1313 -> a
-    71:74:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221 -> a
-    71:74:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
-    75:75:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):222:222 -> a
-    75:75:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
+    71:74:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):235 -> a
+    71:74:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):321 -> a
+    75:75:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):236:236 -> a
+    75:75:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):321 -> a
     76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1309:1309 -> a
-    76:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221 -> a
-    76:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
-    77:84:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):309:316 -> a
-    85:87:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):319:321 -> a
-    1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
-    15:34:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:167 -> b
-    35:41:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):209:215 -> b
-    42:49:com.android.tools.r8.graph.DexString computeMethodBridgeName(com.android.tools.r8.graph.DexEncodedMethod):183:190 -> b
-    42:49:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):216 -> b
-    50:50:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> b
-    1:10:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):269:278 -> c
-    1:1:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):114:114 -> d
-    2:15:void processNest(java.util.List):125:138 -> d
-    2:15:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.r.c.M$a:
+    76:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):235 -> a
+    76:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):321 -> a
+    77:84:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):323:330 -> a
+    85:87:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):333:335 -> a
+    1:15:com.android.tools.r8.utils.Pair extractNest(com.android.tools.r8.graph.DexClass):95:109 -> b
+    16:35:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():162:181 -> b
+    36:42:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):223:229 -> b
+    43:50:com.android.tools.r8.graph.DexString computeMethodBridgeName(com.android.tools.r8.graph.DexEncodedMethod):197:204 -> b
+    43:50:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):230 -> b
+    51:51:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):230:230 -> b
+    1:10:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):283:292 -> c
+    1:4:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):115:118 -> d
+    5:9:void processNest(com.android.tools.r8.graph.DexClass,java.util.List):126:130 -> d
+    5:9:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):118 -> d
+    10:14:void reportDesugarDependencies(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):151:155 -> d
+    10:14:void processNest(com.android.tools.r8.graph.DexClass,java.util.List):134 -> d
+    10:14:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):118 -> d
+    15:20:void processNest(com.android.tools.r8.graph.DexClass,java.util.List):135:140 -> d
+    15:20:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):118 -> d
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.t.c.M$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):431:433 -> <init>
-    1:1:com.android.tools.r8.graph.DexField getField():494:494 -> a
-    1:1:com.android.tools.r8.graph.DexType getHolder():490:490 -> b
-    1:1:com.android.tools.r8.graph.DexType getType():486:486 -> c
-    1:1:boolean isInstance():466:466 -> d
-    1:1:boolean isInstanceGet():478 -> d
-    2:2:boolean isGet():454:454 -> d
-    2:2:boolean isInstanceGet():478 -> d
-    1:1:boolean isGet():454:454 -> e
-    1:1:boolean isPut():462 -> e
-    1:5:boolean equals(java.lang.Object):446:450 -> equals
-    1:1:boolean isStatic():458:458 -> f
-    1:1:boolean isStaticGet():470:470 -> g
-    2:2:boolean isGet():454:454 -> g
-    2:2:boolean isStaticGet():470 -> g
-    1:1:int hashCode():438:438 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.r.c.N:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):445:447 -> <init>
+    1:1:com.android.tools.r8.graph.DexField getField():508:508 -> a
+    1:1:com.android.tools.r8.graph.DexType getHolder():504:504 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():500:500 -> c
+    1:1:boolean isInstance():480:480 -> d
+    1:1:boolean isInstanceGet():492 -> d
+    2:2:boolean isGet():468:468 -> d
+    2:2:boolean isInstanceGet():492 -> d
+    1:1:boolean isGet():468:468 -> e
+    1:1:boolean isPut():476 -> e
+    1:5:boolean equals(java.lang.Object):460:464 -> equals
+    1:1:boolean isStatic():472:472 -> f
+    1:1:boolean isStaticGet():484:484 -> g
+    2:2:boolean isGet():468:468 -> g
+    2:2:boolean isStaticGet():484 -> g
+    1:1:int hashCode():452:452 -> hashCode
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.t.c.N:
     com.android.tools.r8.graph.DexClass currentClass -> a
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> c
     com.android.tools.r8.graph.DexMethod context -> b
-    1:3:void <init>(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexClass):330:332 -> <init>
-    1:1:void setContext(com.android.tools.r8.graph.DexMethod):336:336 -> a
-    2:5:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):342:345 -> a
-    6:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):84:85 -> a
-    6:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):39 -> a
-    6:7:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):345 -> a
+    1:3:void <init>(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexClass):344:346 -> <init>
+    1:1:void setContext(com.android.tools.r8.graph.DexMethod):350:350 -> a
+    2:5:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):356:359 -> a
+    6:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):85:86 -> a
+    6:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):40 -> a
+    6:7:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):359 -> a
     8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):84 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):39 -> a
-    8:8:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):345 -> a
-    9:10:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):346:347 -> a
-    11:11:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):354:354 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):89:89 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):39 -> a
-    12:12:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):354 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):85 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):40 -> a
+    8:8:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):359 -> a
+    9:10:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):360:361 -> a
+    11:11:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):368:368 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):90:90 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):40 -> a
+    12:12:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):368 -> a
     13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):89 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):39 -> a
-    13:13:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):354 -> a
-    14:15:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):355:356 -> a
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):398:398 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):393:393 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):371:371 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):383:383 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):376:376 -> registerInvokeStatic
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):388:388 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):366:366 -> registerInvokeVirtual
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):411:411 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> registerStaticFieldWrite
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.r.c.O:
+    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):90 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):40 -> a
+    13:13:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):368 -> a
+    14:15:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):369:370 -> a
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):412:412 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):407:407 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):385:385 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):397:397 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):390:390 -> registerInvokeStatic
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):402:402 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):380:380 -> registerInvokeVirtual
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):425:425 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):430:430 -> registerStaticFieldWrite
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.t.c.P:
     java.util.Map getFieldMap -> b
     java.util.Map putFieldMap -> c
     com.android.tools.r8.graph.DexType nestConstructorType -> a
@@ -30692,20 +30701,30 @@
     8:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):32:46 -> <init>
     1:3:com.android.tools.r8.graph.DexMethod lookupFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,java.util.Map):51:53 -> a
     4:9:boolean isConstructorBridge(com.android.tools.r8.graph.DexMethod):92:97 -> a
+    1:1:com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder builder():131:131 -> b
     1:5:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):78:82 -> isContextFreeForMethod
     1:1:boolean isContextFreeForMethods():73:73 -> isContextFreeForMethods
     1:2:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):61:62 -> lookupGetFieldForMethod
-    1:16:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):115:130 -> lookupMethod
+    1:14:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):114:127 -> lookupMethod
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):102:107 -> lookupPrototypeChanges
     1:2:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):67:68 -> lookupPutFieldForMethod
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.r.c.P:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder -> com.android.tools.r8.t.c.O:
+    boolean $assertionsDisabled -> h
+    java.util.Map getFieldMap -> f
+    java.util.Map putFieldMap -> g
+    1:1:void <clinit>():134:134 -> <clinit>
+    1:4:void <init>():134:137 -> <init>
+    1:1:void mapGetField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):140:140 -> a
+    2:8:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:154 -> a
+    1:1:void mapPutField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):144:144 -> b
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.t.c.Q:
     1:1:void <init>():19:19 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto):34:38 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.r.c.P$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.t.c.Q$a:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -30753,39 +30772,33 @@
     35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):131:131 -> b
     37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.r.c.Q:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.t.c.S:
     1:1:void <init>():155:155 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.r.c.S:
-    boolean $assertionsDisabled -> k
-    java.util.Map lensGetFieldBridges -> i
-    java.util.Map lensPutFieldBridges -> j
-    java.util.Map lensBridges -> h
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):39:39 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.t.c.T:
+    boolean $assertionsDisabled -> h
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):34:34 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
-    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
+    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:39 -> a
     2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> a
-    2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
-    3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
-    5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    6:22:void computeAndProcessNestsConcurrently(java.util.concurrent.ExecutorService):99:115 -> a
-    6:22:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    23:25:void addDeferredBridgesAndMapMethods():72:74 -> a
-    23:25:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):47 -> a
-    26:28:void clearNestAttributes():91:93 -> a
-    26:28:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):48 -> a
-    29:29:boolean nothingToMap():63:63 -> a
-    29:29:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):49 -> a
-    30:39:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):50:59 -> a
-    40:46:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.Map):79:85 -> a
-    47:50:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):126:129 -> a
-    51:54:void reportIncompleteNest(java.util.List):135:138 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.r.c.Y:
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1108 -> a
+    2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39 -> a
+    3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:40 -> a
+    5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:39 -> a
+    6:22:void computeAndProcessNestsConcurrently(java.util.concurrent.ExecutorService):78:94 -> a
+    6:22:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):41 -> a
+    23:24:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):42:43 -> a
+    25:27:void clearNestAttributes():70:72 -> a
+    25:27:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
+    28:29:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):45:46 -> a
+    30:32:void addDeferredBridgesAndMapMethods(com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder):51:53 -> a
+    33:39:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.function.BiConsumer):58:64 -> a
+    40:43:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):105:108 -> a
+    44:47:void reportIncompleteNest(java.util.List):114:117 -> a
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.t.c.Z:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -30859,8 +30872,8 @@
     165:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):458 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.r.c.T:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.r.c.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.t.c.U:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.t.c.Y:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -30901,16 +30914,16 @@
     37:38:void desugar():369:370 -> a
     39:69:void desugar():369:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):283:283 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.r.c.U:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.t.c.V:
     com.android.tools.r8.ir.code.Value value -> c
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):423:424 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():429:429 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.r.c.V:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.t.c.W:
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):406:407 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.r.c.W:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.t.c.X:
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> d
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):436:438 -> <init>
@@ -30919,7 +30932,7 @@
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.r.c.Z:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.t.c.a0:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -30934,7 +30947,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():33:33 -> j
     1:1:com.android.tools.r8.graph.DexItemFactory factory():43:43 -> k
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.r.c.a0:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.t.c.b0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -31029,7 +31042,7 @@
     707:707:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):82 -> a
     708:724:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):83:99 -> a
     725:729:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):98:102 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.r.c.b0.a:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.t.c.c0.a:
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1818:1847 -> A
     1:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5061:5078 -> A0
     19:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5075:5089 -> A0
@@ -31679,7 +31692,7 @@
     48:62:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5050 -> z0
     63:63:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> z0
     64:107:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5013:5056 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.r.c.b0.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.t.c.c0.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:5:void rewriteLogicalAnd(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:24 -> a
@@ -31688,20 +31701,20 @@
     6:6:void rewriteLogicalOr(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):32:32 -> b
     1:5:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):38:42 -> c
     6:6:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):41:41 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.r.c.b0.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.t.c.c0.c:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.r.c.b0.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.t.c.c0.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:8:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
     1:1:void rewriteSetOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):25:25 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.r.c.b0.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.t.c.c0.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:2:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):12:13 -> a
     3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt.getExtensionOrNull(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12:12 -> a
@@ -31745,12 +31758,12 @@
     1:4:void com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteOrElseGet(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:21 -> e
     1:7:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> f
     1:6:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:24 -> g
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.r.c.b0.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.t.c.c0.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:25 -> a
     5:5:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):24:24 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.r.c.b0.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.t.c.c0.g:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void rewriteAsIdentity(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):33:36 -> a
@@ -31773,54 +31786,57 @@
 com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.ir.optimize.d:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.List configuration -> c
-    boolean $assertionsDisabled -> e
-    boolean enabled -> d
-    1:1:void <clinit>():30:30 -> <clinit>
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defaultTransformation -> c
+    java.util.List configuration -> d
+    boolean enabled -> e
+    boolean $assertionsDisabled -> f
+    1:1:void <clinit>():29:29 -> <clinit>
     1:15:void <init>(com.android.tools.r8.graph.AppView):81:95 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry):93:93 -> a
-    2:5:boolean isPassthroughAll(com.android.tools.r8.AssertionsConfiguration):101:104 -> a
-    6:6:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):222:222 -> a
-    7:25:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):109:127 -> a
-    7:25:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
-    26:49:boolean isDescriptorForClassOrInnerClass(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):148:171 -> a
-    26:49:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    26:49:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
-    50:54:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):128:132 -> a
-    50:54:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
-    55:56:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):115:116 -> a
-    55:56:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
-    57:62:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):448:453 -> a
-    57:62:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):116 -> a
-    57:62:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
-    63:66:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):117:120 -> a
-    63:66:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
-    67:90:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):112:135 -> a
-    67:90:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
-    91:100:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):226:235 -> a
-    101:101:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    101:101:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235 -> a
-    102:104:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239:241 -> a
-    105:105:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    105:105:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
-    106:110:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):247:251 -> a
-    111:111:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    111:111:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
-    112:123:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252:263 -> a
-    124:124:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    124:124:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):263 -> a
-    125:125:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:262 -> a
+    1:1:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.AssertionsConfiguration):94:94 -> a
+    2:2:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):101:101 -> a
+    3:8:boolean com.android.tools.r8.utils.AssertionConfigurationWithDefault.isPassthroughAll():26:31 -> a
+    3:8:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):102 -> a
+    9:9:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):220:220 -> a
+    10:29:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):106:125 -> a
+    10:29:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
+    30:53:boolean isDescriptorForClassOrInnerClass(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):146:169 -> a
+    30:53:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):125 -> a
+    30:53:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
+    54:58:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):126:130 -> a
+    54:58:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
+    59:60:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):113:114 -> a
+    59:60:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
+    61:66:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):448:453 -> a
+    61:66:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):114 -> a
+    61:66:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
+    67:70:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):115:118 -> a
+    67:70:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
+    71:94:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):110:133 -> a
+    71:94:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223 -> a
+    95:104:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):224:233 -> a
+    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    105:105:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    106:108:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):237:239 -> a
+    109:109:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    109:109:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244 -> a
+    110:114:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245:249 -> a
+    115:115:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
+    115:115:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250 -> a
+    116:127:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250:261 -> a
+    128:128:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
+    128:128:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
+    129:129:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:260 -> a
 com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.ir.optimize.b:
 com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.ir.optimize.c:
-    com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry entry -> a
     com.android.tools.r8.graph.DexString value -> b
-    1:1:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):32:32 -> <init>
-    2:26:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):38:62 -> <init>
-    27:40:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):58:71 -> <init>
-    41:49:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):42:50 -> <init>
-    50:72:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):46:68 -> <init>
-    1:1:com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):32:32 -> a
-    1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):32:32 -> b
+    com.android.tools.r8.AssertionsConfiguration entry -> a
+    1:1:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):31:31 -> <init>
+    2:26:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):37:61 -> <init>
+    27:40:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):57:70 -> <init>
+    41:49:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory) -> <init>
+    50:72:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):45:67 -> <init>
+    1:1:com.android.tools.r8.AssertionsConfiguration access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):31:31 -> a
+    1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):31:31 -> b
 com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover -> com.android.tools.r8.ir.optimize.e:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
@@ -32005,7 +32021,7 @@
     4:4:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):239:239 -> a
     5:28: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):323:346 -> a
     29:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413:413 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1324:1324 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1327:1327 -> a
     30:30:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413 -> a
     31:32:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():629:630 -> a
     31:32:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413 -> a
@@ -32221,7 +32237,7 @@
     35:40:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1315:1320 -> e
     41:57:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1352:1368 -> e
     41:57:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1320 -> e
-    58:58:boolean com.android.tools.r8.graph.DexType.isFloatType():217:217 -> e
+    58:58:boolean com.android.tools.r8.graph.DexType.isFloatType():224:224 -> e
     58:58:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1368 -> e
     58:58:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1320 -> e
     59:98:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1369:1408 -> e
@@ -32265,7 +32281,7 @@
     56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> k
     56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1766 -> k
     57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1781 -> k
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1285:1285 -> k
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1288:1288 -> k
     72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1782 -> k
     73:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1782:1785 -> k
     77:78:void forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1812:1813 -> k
@@ -32516,7 +32532,7 @@
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2228:2228 -> doEquivalent
     2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2241 -> doEquivalent
     2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2228 -> doEquivalent
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1257:1257 -> doEquivalent
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1260:1260 -> doEquivalent
     3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241 -> doEquivalent
     3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2228 -> doEquivalent
     4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2245:2260 -> doEquivalent
@@ -32895,9 +32911,9 @@
     20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):114:114 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):141:141 -> a
     22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1476 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1479 -> a
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):141 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1476:1476 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1479:1479 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):141 -> a
     24:29:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1011:1016 -> a
     24:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
@@ -32913,9 +32929,9 @@
     58:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):188 -> a
     59:59:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):189:189 -> a
     60:67:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):193:200 -> a
-    68:68:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
+    68:68:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):98:98 -> a
     68:68:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):200 -> a
-    69:69:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
+    69:69:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):98:98 -> a
     69:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):203 -> a
     70:70:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.DexEncodedMethod):207:207 -> a
     71:72:java.util.Set methodsToRevisit():241:242 -> a
@@ -32973,10 +32989,10 @@
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):355 -> a
     5:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):356:364 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):98:98 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):365 -> a
     15:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):367:371 -> a
-    20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
+    20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):98:98 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):374 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):375:375 -> a
     22:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):381:386 -> a
@@ -33112,7 +33128,7 @@
     119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     119:119:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):366 -> a
     120:141:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):367:388 -> a
-    142:142:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):77:77 -> a
+    142:142:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):74:74 -> a
     142:142:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):388 -> a
     143:145:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):389:391 -> a
     146:146:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
@@ -34313,7 +34329,7 @@
     101:111:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):727:737 -> a
     101:111:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):337 -> a
     112:136:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):339:363 -> a
-    137:177:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):933:973 -> a
+    137:177:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):934:974 -> a
     137:177:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):364 -> a
     178:181:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):373:376 -> a
     182:183:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):312:313 -> a
@@ -34368,37 +34384,37 @@
     517:517:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set,java.util.function.Supplier):836:836 -> a
     518:521:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):844:847 -> a
     522:522:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):848:848 -> a
-    523:553:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):858:888 -> a
-    554:567:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):892:905 -> a
-    568:580:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):983:995 -> a
-    581:611:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1008:1038 -> a
-    612:615:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1069:1072 -> a
-    612:615:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1039 -> a
-    616:616:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
-    616:616:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1072 -> a
-    616:616:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1039 -> a
-    617:618:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1077:1078 -> a
-    617:618:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1039 -> a
-    619:645:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1034:1060 -> a
-    646:646:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1056:1056 -> a
-    647:647:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1099:1099 -> a
-    648:655:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1082:1089 -> a
-    648:655:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1100 -> a
-    656:656:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    656:656:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1089 -> a
-    656:656:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1100 -> a
-    657:662:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1090:1095 -> a
-    657:662:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1100 -> a
-    663:663:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():66:66 -> a
-    663:663:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1095 -> a
-    663:663:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1100 -> a
-    664:666:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1102:1104 -> a
-    667:683:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):1113:1129 -> a
-    684:684:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):1128:1128 -> a
-    685:685:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1143:1143 -> a
-    686:687:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1143:1144 -> a
+    523:554:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):858:889 -> a
+    555:568:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):893:906 -> a
+    569:581:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):984:996 -> a
+    582:612:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1009:1039 -> a
+    613:616:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1070:1073 -> a
+    613:616:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1040 -> a
+    617:617:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
+    617:617:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1073 -> a
+    617:617:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1040 -> a
+    618:619:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1078:1079 -> a
+    618:619:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1040 -> a
+    620:646:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1035:1061 -> a
+    647:647:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1057:1057 -> a
+    648:648:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1100:1100 -> a
+    649:656:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1083:1090 -> a
+    649:656:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1101 -> a
+    657:657:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    657:657:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1090 -> a
+    657:657:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1101 -> a
+    658:663:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1091:1096 -> a
+    658:663:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1101 -> a
+    664:664:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():66:66 -> a
+    664:664:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1096 -> a
+    664:664:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1101 -> a
+    665:667:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1103:1105 -> a
+    668:684:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):1114:1130 -> a
+    685:685:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):1129:1129 -> a
+    686:686:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1144:1144 -> a
+    687:688:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1144:1145 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():126:126 -> b
-    2:2:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):996:996 -> b
+    2:2:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):997:997 -> b
     1:1:java.util.List getIndirectInlinees():134:134 -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet getReceivers():138:138 -> d
     1:81:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():195:275 -> e
@@ -34417,7 +34433,7 @@
     1:2:void <clinit>():73:74 -> <clinit>
     1:1:void <init>(java.lang.String,int):72:72 -> <init>
 com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.ir.optimize.u0.i:
-    1:1:void <init>():1147:1147 -> <init>
+    1:1:void <init>():1148:1148 -> <init>
 com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.a:
     com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo INSTANCE -> d
     1:1:void <clinit>():8:8 -> <clinit>
@@ -34714,7 +34730,7 @@
     1236:1236:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
     1236:1236:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):911 -> a
     1237:1239:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):912:914 -> a
-    1240:1241:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():256:257 -> a
+    1240:1241:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():263:264 -> a
     1240:1241:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):914 -> a
     1242:1244:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):914:916 -> a
     1245:1256:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):914:925 -> a
@@ -36138,24 +36154,25 @@
 com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.x0.b:
     void optimize(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.DexEncodedMethod,java.util.Set) -> a
 com.android.tools.r8.ir.optimize.library.LibraryMethodOptimizer -> com.android.tools.r8.ir.optimize.x0.c:
-    java.util.Map libraryMethodModelCollections -> a
-    boolean $assertionsDisabled -> b
+    java.util.Map libraryMethodModelCollections -> b
+    com.android.tools.r8.graph.AppView appView -> a
+    boolean $assertionsDisabled -> c
     1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):30:30 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):27:31 -> <init>
-    1:3:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):35:37 -> a
-    4:4:void optimize(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.ir.conversion.MethodProcessor):46:46 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):32:32 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):29:34 -> <init>
+    1:3:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):38:40 -> a
+    4:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):48:48 -> a
     5:5:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    5:5:void optimize(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.ir.conversion.MethodProcessor):47 -> a
-    6:11:void optimize(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.ir.conversion.MethodProcessor):48:53 -> a
-    12:14:void optimizeInvoke(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.DexEncodedMethod,java.util.Set):70:72 -> a
-    12:14:void optimize(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.ir.conversion.MethodProcessor):55 -> a
-    15:17:void optimizeInvoke(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.DexEncodedMethod,java.util.Set):71:73 -> a
-    15:17:void optimize(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.ir.conversion.MethodProcessor):55 -> a
-    18:19:void optimize(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.ir.conversion.MethodProcessor):59:60 -> a
+    5:5:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):49 -> a
+    6: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):50:55 -> a
+    12:14:void optimizeInvoke(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.DexEncodedMethod,java.util.Set):72:74 -> a
+    12:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):57 -> a
+    15:17:void optimizeInvoke(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.DexEncodedMethod,java.util.Set):73:75 -> a
+    15:17:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):57 -> a
+    18:19:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):61:62 -> a
     20:20:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    20:20:void optimize(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.ir.conversion.MethodProcessor):60 -> a
-    21:21:void optimize(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.ir.conversion.MethodProcessor):60:60 -> a
+    20:20:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):62 -> a
+    21:21:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):62:62 -> a
 com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.x0.d:
     com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -37205,14 +37222,14 @@
     98:103:void computeLiveRanges():2492:2497 -> b
     98:103:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     98:103:void allocateRegisters():215 -> b
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1209:1209 -> b
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1212:1212 -> b
     104:104:void computeLiveRanges():2497 -> b
     104:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     104:104:void allocateRegisters():215 -> b
     105:105:void computeLiveRanges():2497:2497 -> b
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     105:105:void allocateRegisters():215 -> b
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1218:1218 -> b
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1221:1221 -> b
     106:106:void computeLiveRanges():2497 -> b
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     106:106:void allocateRegisters():215 -> b
@@ -37259,7 +37276,7 @@
     309:313:void increaseCapacity(int,boolean):2964:2968 -> b
     1:3:int registersUsed():591:593 -> c
     4:4:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1502 -> c
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1224:1224 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1227:1227 -> c
     5:5:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
     6:26:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
     27:39:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
@@ -37267,10 +37284,10 @@
     42:42:boolean registersAreFree(int,boolean):3112:3112 -> c
     1:1:int highestUsedRegister():586:586 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1257:1257 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1260:1260 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1431:1431 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1434:1434 -> d
     5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
@@ -37278,12 +37295,12 @@
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1257:1257 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1260:1260 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1431:1431 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1434:1434 -> d
     30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
     31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
@@ -37704,7 +37721,7 @@
     91:95:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     96:104:void removeArgumentRestores(java.util.Set):332:340 -> a
     105:129:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1193:1193 -> a
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1196:1196 -> a
     130:130:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     131:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     137:141:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -37725,7 +37742,7 @@
     1:3:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):152:154 -> f
     4:4:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):153:153 -> f
     5:5:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):310:310 -> f
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.r.d.a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.t.d.a:
     1:1:void <init>():21:21 -> <init>
     1:8:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):38:45 -> buildIR
     1:8:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):56:63 -> buildInliningIR
@@ -37733,27 +37750,27 @@
     1:1:int computeHashCode():78:78 -> computeHashCode
     1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):73:73 -> registerCodeReferences
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.r.d.a$a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.t.d.a$a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.r.d.g:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.t.d.g:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41:41 -> <init>
     1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46:46 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46 -> a
     3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):49:55 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.r.d.b:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.t.d.b:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):293:294 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():299:307 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():305:305 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():302:314 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.r.d.c:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.t.d.c:
     com.android.tools.r8.graph.DexString message -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):324:325 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():330:340 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():338:338 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():335:344 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.r.d.d:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.t.d.d:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -37774,7 +37791,7 @@
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():140 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():139:139 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():136:148 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.r.d.e:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.t.d.e:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -37792,7 +37809,7 @@
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():218 -> a
     45:50:com.android.tools.r8.graph.CfCode generateCfCode():220:225 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.r.d.f:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.t.d.f:
     com.android.tools.r8.graph.DexField wrapperField -> e
     com.android.tools.r8.graph.DexType argType -> c
     com.android.tools.r8.graph.DexField reverseWrapperField -> d
@@ -37800,7 +37817,7 @@
     1:36:com.android.tools.r8.graph.CfCode generateCfCode():245:280 -> a
     37:37:com.android.tools.r8.graph.CfCode generateCfCode():278:278 -> a
     38:47:com.android.tools.r8.graph.CfCode generateCfCode():275:284 -> a
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.r.d.h:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.t.d.h:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -37809,13 +37826,13 @@
     1:41:com.android.tools.r8.graph.CfCode generateCfCode():49:89 -> a
     1:4:void addReturn(java.util.List):100:103 -> b
     1:2:void loadExtraParameters(java.util.List):94:95 -> c
-com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.r.d.i:
+com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.t.d.i:
     com.android.tools.r8.graph.DexType exceptionType -> l
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType):24:25 -> <init>
     1:11:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):32:42 -> d
     12:19:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):37:44 -> d
     1:1:void prepareInstructions():30:30 -> h
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.r.d.j:
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.t.d.j:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -37827,16 +37844,16 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):42:42 -> d
     1:1:void lambda$prepareInstructions$5(int,com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> e
     1:12:void prepareInstructions():32:43 -> h
-    13:13:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> h
-    13:13:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> h
+    13:13:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():480:480 -> h
+    13:13:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():496 -> h
     13:13:void prepareInstructions():43 -> h
-    14:14:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> h
+    14:14:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():496:496 -> h
     14:14:void prepareInstructions():43 -> h
     15:20:void prepareInstructions():44:49 -> h
-    21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> h
+    21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():488:488 -> h
     21:21:void prepareInstructions():49 -> h
     22:25:void prepareInstructions():49:52 -> h
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.r.d.k:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.t.d.k:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -37853,7 +37870,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> h
     1:27:boolean checkSignatures():146:172 -> i
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.r.d.k$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.t.d.k$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     boolean extraNullParameter -> i
     com.android.tools.r8.graph.DexType targetReceiver -> d
@@ -37873,7 +37890,7 @@
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):60:60 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):65:65 -> b
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setExtraNullParameter():85:85 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.r.d.l:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.t.d.l:
     java.util.function.Consumer registryCallback -> b
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> a
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
@@ -37881,7 +37898,7 @@
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> getSourceCodeProvider
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.r.d.m:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.t.d.m:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType holder -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
@@ -37889,7 +37906,7 @@
     2:2:java.util.List defaultTryCatchs():46:46 -> a
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):33 -> a
     3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):34:34 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.r.d.n:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.t.d.n:
     java.util.function.Predicate endsBlock -> j
     com.android.tools.r8.ir.code.Position position -> h
     java.util.List constructors -> f
@@ -37940,19 +37957,19 @@
     1:1:int nextInstructionIndex():109:109 -> g
     void prepareInstructions() -> h
     1:3:int getParamRegister(int):92:94 -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.s.a.a.a.a:
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.s.a.a.a.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.u.a.a.a.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.u.a.a.a.b:
     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.s.a.a.a.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.u.a.a.a.c:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
     long mix(long) -> b
     1:1:int maxFill(int,float):205:205 -> b
     long nextPowerOfTwo(long) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.s.a.a.a.d:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.s.a.a.a.e.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.u.a.a.a.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.u.a.a.a.e.a:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(boolean):68:68 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
@@ -37963,12 +37980,12 @@
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanIterator -> com.android.tools.r8.s.a.a.a.e.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanIterator -> com.android.tools.r8.u.a.a.a.e.b:
     1:1:void <init>():34:34 -> <init>
     1:1:java.lang.Boolean next():57:57 -> next
     1:1:java.lang.Object next():33 -> next
     1:1:void remove():68:68 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.s.a.a.a.e.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.u.a.a.a.e.c:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(boolean):87:87 -> c
     boolean remove(boolean) -> d
@@ -37977,7 +37994,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.iterator():119:119 -> hashCode
     3:3:int hashCode():58 -> hashCode
     4:4:int hashCode():61:61 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.s.a.a.a.e.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.u.a.a.a.e.e:
     int size -> b
     1:4:void <init>(boolean[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):29:29 -> a
@@ -37997,7 +38014,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.s.a.a.a.e.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.u.a.a.a.e.d:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
@@ -38005,13 +38022,13 @@
     1:2:boolean nextBoolean():129:130 -> nextBoolean
     3:3:boolean nextBoolean():129:129 -> nextBoolean
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.s.a.a.a.e.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.u.a.a.a.e.f:
     boolean[] EMPTY_ARRAY -> a
     1:1:void <clinit>():95:95 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.s.a.a.a.e.g:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.s.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.u.a.a.a.e.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.u.a.a.a.e.i:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.s.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.u.a.a.a.e.h:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):370:370 -> <init>
@@ -38040,13 +38057,13 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.s.a.a.a.e.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.s.a.a.a.e.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.u.a.a.a.e.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.u.a.a.a.e.k:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean hasNext():730:730 -> hasNext
     1:1:boolean nextBoolean():735:735 -> nextBoolean
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.s.a.a.a.f.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.u.a.a.a.f.b:
     int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():46 -> <init>
@@ -38090,7 +38107,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():311:311 -> toString
     2:2:java.lang.String toString():343 -> toString
     3:17:java.lang.String toString():343:357 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry -> com.android.tools.r8.s.a.a.a.f.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry -> com.android.tools.r8.u.a.a.a.f.a:
     int value -> b
     int key -> a
     1:3:void <init>(int,int):122:124 -> <init>
@@ -38109,7 +38126,7 @@
     3:3:java.lang.Integer setValue(java.lang.Integer):175 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):113 -> setValue
     1:1:java.lang.String toString():194:194 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.s.a.a.a.f.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.u.a.a.a.f.c:
     java.lang.Object defRetValue -> a
     1:1:void <init>():44:44 -> <init>
     1:1:java.lang.Object put(int,java.lang.Object):71:71 -> a
@@ -38120,7 +38137,7 @@
     2:4:java.lang.Object put(java.lang.Object,java.lang.Object):41 -> put
     1:1:java.lang.Object remove(int):82:82 -> remove
     2:4:java.lang.Object remove(java.lang.Object):153:155 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap -> com.android.tools.r8.s.a.a.a.f.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap -> com.android.tools.r8.u.a.a.a.f.e:
     1:1:void <init>():45:45 -> <init>
     boolean containsKey(int) -> a
     1:1:java.util.Set entrySet():42:42 -> entrySet
@@ -38131,7 +38148,7 @@
     14:16:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction.put(java.lang.Integer,java.lang.Object):135:137 -> putAll
     14:16:void putAll(java.util.Map):82 -> putAll
     1:17:java.lang.String toString():304:320 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap$BasicEntry -> com.android.tools.r8.s.a.a.a.f.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap$BasicEntry -> com.android.tools.r8.u.a.a.a.f.d:
     java.lang.Object value -> b
     int key -> a
     1:3:void <init>(int,java.lang.Object):109:111 -> <init>
@@ -38143,7 +38160,7 @@
     1:1:int hashCode():151:151 -> hashCode
     1:1:java.lang.Object setValue(java.lang.Object):138:138 -> setValue
     1:1:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap -> com.android.tools.r8.s.a.a.a.f.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap -> com.android.tools.r8.u.a.a.a.f.f:
     1:1:void <init>():33:33 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():293:293 -> entrySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> entrySet
@@ -38162,7 +38179,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):30:30 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):59:59 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):30 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> com.android.tools.r8.s.a.a.a.f.f$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> com.android.tools.r8.u.a.a.a.f.f$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap):122:122 -> <init>
     1:1:boolean contains(int):125:125 -> b
@@ -38170,7 +38187,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
     1:1:int size():130:130 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.s.a.a.a.f.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.u.a.a.a.f.g:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(int):68:68 -> a
     2:2:boolean add(java.lang.Integer):114:114 -> a
@@ -38195,12 +38212,12 @@
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.s.a.a.a.f.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.u.a.a.a.f.h:
     1:1:void <init>():34:34 -> <init>
     1:1:java.lang.Integer next():57:57 -> next
     1:1:java.lang.Object next():33 -> next
     1:1:void remove():68:68 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.s.a.a.a.f.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.u.a.a.a.f.k:
     1:1:void <init>():33:33 -> <init>
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     1:1:boolean add(int):86:86 -> a
@@ -38255,7 +38272,7 @@
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):310:313 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):312:312 -> subList
     1:14:java.lang.String toString():709:722 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList -> com.android.tools.r8.s.a.a.a.f.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList -> com.android.tools.r8.u.a.a.a.f.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList l -> a
     int from -> b
     int to -> c
@@ -38310,7 +38327,7 @@
     1:1:java.util.List subList(int,int):726:726 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):880:883 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):882:882 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.s.a.a.a.f.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.u.a.a.a.f.i:
     boolean $assertionsDisabled -> e
     int last -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList this$0 -> d
@@ -38332,7 +38349,7 @@
     1:1:int previousIndex():848:848 -> previousIndex
     1:10:void remove():864:873 -> remove
     11:11:void remove():864:864 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.s.a.a.a.f.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.u.a.a.a.f.l:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
     1:1:void add(int):57:57 -> a
@@ -38348,13 +38365,13 @@
     1:1:void set(java.lang.Object):34:34 -> set
     2:2:void set(java.lang.Integer):70:70 -> set
     2:2:void set(java.lang.Object):34 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.s.a.a.a.f.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.u.a.a.a.f.m:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(int):87:87 -> c
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:5:int hashCode():57:61 -> hashCode
     1:1:boolean remove(int):75:75 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.s.a.a.a.f.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.u.a.a.a.f.n:
     1:1:void <init>():23:23 -> <init>
     1:1:java.lang.Integer first():94:94 -> first
     1:1:java.lang.Object first():22 -> first
@@ -38388,7 +38405,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet.tailSet(int):160:160 -> tailSet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(java.lang.Integer):68 -> tailSet
     3:3:java.util.SortedSet tailSet(java.lang.Object):22 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.s.a.a.a.f.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.u.a.a.a.f.r:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -38422,8 +38439,8 @@
     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):536:536 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> values
     2:2:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.s.a.a.a.f.o:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.f.q:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.u.a.a.a.f.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.f.q:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1):133:133 -> <init>
@@ -38433,7 +38450,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):212:223 -> remove
     1:1:int size():195:195 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.f.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.u.a.a.a.f.p:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -38445,16 +38462,16 @@
     3:3:java.lang.Object next():136 -> next
     1:5:void remove():153:157 -> remove
     6:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.s.a.a.a.f.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.u.a.a.a.f.s:
     boolean containsKey(int) -> a
     int put(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.s.a.a.a.f.v:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.u.a.a.a.f.v:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.s.a.a.a.f.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.u.a.a.a.f.t:
     int getIntValue() -> a
     int getIntKey() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.f.u:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.s.a.a.a.f.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.f.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.u.a.a.a.f.E:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> j
     float f -> i
@@ -38518,7 +38535,7 @@
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.f.w:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.f.w:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:boolean contains(int):879:879 -> b
@@ -38526,7 +38543,7 @@
     1:1:java.util.Iterator iterator():866:866 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     1:1:int size():874:874 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.f.x:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.f.x:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -38534,13 +38551,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry next():669:669 -> next
     1:1:java.lang.Object next():664 -> next
     1:2:void remove():674:675 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.f.y:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.f.y:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     1:1:java.lang.Integer next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
     1:1:int nextInt():793:793 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.f.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.f.z:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803:803 -> <init>
@@ -38550,7 +38567,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:3:boolean remove(int):821:823 -> remove
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.f.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.f.A:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -38571,7 +38588,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):529:529 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):467 -> setValue
     1:1:java.lang.String toString():547:547 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.f.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.f.B:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):689:689 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):689:689 -> <init>
@@ -38581,7 +38598,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():691:691 -> iterator
     1:30:boolean remove(java.lang.Object):724:753 -> remove
     1:1:int size():762:762 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.f.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.f.C:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> f
     int last -> b
@@ -38602,13 +38619,13 @@
     23:23:void remove():644 -> remove
     24:25:void remove():647:648 -> remove
     26:26:void remove():641:641 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.f.D:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.D:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     1:1:java.lang.Integer next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
     1:1:int nextInt():854:854 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.s.a.a.a.f.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.u.a.a.a.f.K:
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry -> e
@@ -38809,8 +38826,8 @@
     1:1:int size():985:985 -> size
     1:1:java.util.Collection values():41:41 -> values
     2:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1384:1401 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.s.a.a.a.f.F:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.s.a.a.a.f.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.u.a.a.a.f.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.u.a.a.a.f.H:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -38835,13 +38852,13 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1161:1161 -> 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):1236:1236 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1161 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.s.a.a.a.f.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.u.a.a.a.f.G:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2):1162:1162 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1162:1162 -> 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):1164:1164 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1162 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.s.a.a.a.f.I:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.u.a.a.a.f.I:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1384:1384 -> <init>
     1:1:void clear():1398:1398 -> clear
@@ -38849,7 +38866,7 @@
     1:1:java.util.Iterator iterator():1384:1384 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1386:1386 -> iterator
     1:1:int size():1394:1394 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.s.a.a.a.f.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.u.a.a.a.f.J:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> c
     int info -> e
@@ -38876,7 +38893,7 @@
     1:1:boolean succ():795:795 -> k
     1:2:java.lang.Object setValue(java.lang.Object):923:924 -> setValue
     1:1:java.lang.String toString():958:958 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.s.a.a.a.f.K$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.u.a.a.a.f.K$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1131:1131 -> <init>
     1:1:void add(java.lang.Object):1130:1130 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1155:1155 -> add
@@ -38888,7 +38905,7 @@
     1:1:void set(java.lang.Object):1130:1130 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1150:1150 -> set
     2:2:void set(java.lang.Object):1130 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.s.a.a.a.f.K$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.u.a.a.a.f.K$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1253:1253 -> <init>
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void add(java.lang.Integer):1301:1301 -> add
@@ -38902,14 +38919,14 @@
     1:1:void set(java.lang.Object):1252:1252 -> set
     2:2:void set(java.lang.Integer):1295:1295 -> set
     2:2:void set(java.lang.Object):1252 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.s.a.a.a.f.K$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.u.a.a.a.f.K$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1308:1308 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1308:1308 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1308:1308 -> iterator
     2:2:java.util.Iterator iterator():1308:1308 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1311:1311 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.s.a.a.a.f.K$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.u.a.a.a.f.K$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
@@ -38993,7 +39010,7 @@
     1:5:int size():1665:1669 -> size
     1:1:java.util.Collection values():1435:1435 -> values
     2:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1598:1618 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.s.a.a.a.f.L:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.u.a.a.a.f.L:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -39028,7 +39045,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1497:1497 -> 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):1574:1574 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1497 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.s.a.a.a.f.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.u.a.a.a.f.M:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1598:1598 -> <init>
     1:1:void clear():1615:1615 -> clear
@@ -39036,14 +39053,14 @@
     1:1:java.util.Iterator iterator():1598:1598 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1600:1600 -> iterator
     1:1:int size():1610:1610 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.s.a.a.a.f.K$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.u.a.a.a.f.K$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1580:1580 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1580:1580 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1580:1580 -> iterator
     2:2:java.util.Iterator iterator():1580:1580 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1582:1582 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.s.a.a.a.f.K$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.u.a.a.a.f.K$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1808:1808 -> <init>
     1:1:void add(java.lang.Object):1807:1807 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1832:1832 -> add
@@ -39055,7 +39072,7 @@
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1827:1827 -> set
     2:2:void set(java.lang.Object):1807 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.s.a.a.a.f.K$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.u.a.a.a.f.K$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:2:void updateNext():1802:1803 -> i
@@ -39070,7 +39087,7 @@
     4:4:void updatePrevious():1798:1798 -> j
     5:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):232:232 -> j
     5:5:void updatePrevious():1798 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.s.a.a.a.f.K$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.u.a.a.a.f.K$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void add(java.lang.Integer):1896:1896 -> add
@@ -39084,14 +39101,14 @@
     1:1:void set(java.lang.Object):1846:1846 -> set
     2:2:void set(java.lang.Integer):1890:1890 -> set
     2:2:void set(java.lang.Object):1846 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.s.a.a.a.f.K$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.u.a.a.a.f.K$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1910:1910 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1910:1910 -> <init>
     1:1:void add(java.lang.Object):1928:1928 -> add
     1:1:java.lang.Object next():1913:1913 -> next
     1:1:java.lang.Object previous():1918:1918 -> previous
     1:1:void set(java.lang.Object):1923:1923 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.s.a.a.a.f.K$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.u.a.a.a.f.K$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> c
@@ -39111,14 +39128,14 @@
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:11:void remove():1096:1106 -> remove
     12:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.s.a.a.a.f.K$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.K$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1348:1348 -> <init>
     1:1:void add(java.lang.Object):1366:1366 -> add
     1:1:java.lang.Object next():1351:1351 -> next
     1:1:java.lang.Object previous():1356:1356 -> previous
     1:1:void set(java.lang.Object):1361:1361 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.s.a.a.a.f.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.u.a.a.a.f.P:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -39148,8 +39165,8 @@
     1:1:int size():252:252 -> size
     1:1:java.util.Collection values():37:37 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.s.a.a.a.f.N:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.f.P$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.u.a.a.a.f.N:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.f.P$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1):133:133 -> <init>
@@ -39159,7 +39176,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.f.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.u.a.a.a.f.O:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -39171,18 +39188,18 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.s.a.a.a.f.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.u.a.a.a.f.Q:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.s.a.a.a.f.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.u.a.a.a.f.S:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.s.a.a.a.f.S$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.u.a.a.a.f.S$a:
     int getIntKey() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.f.T:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.s.a.a.a.f.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.f.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.u.a.a.a.f.V:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():124:124 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.s.a.a.a.f.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.u.a.a.a.f.U:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():46 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.containsKey(int) -> a
@@ -39200,7 +39217,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():86:86 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():86:86 -> values
     2:2:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.s.a.a.a.f.X:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.u.a.a.a.f.X:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> j
     java.lang.Object[] value -> c
     float f -> i
@@ -39264,7 +39281,7 @@
     1:1:int size():386:386 -> size
     1:1:java.util.Collection values():49:49 -> values
     2:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.f.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.f.W:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
@@ -39272,7 +39289,7 @@
     1:1:java.util.Iterator iterator():794:794 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.f.X$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.f.X$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -39280,13 +39297,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.f.X$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.f.X$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:java.lang.Integer next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:int nextInt():727:727 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.f.X$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.f.X$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -39296,7 +39313,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.f.X$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.f.X$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -39308,7 +39325,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.f.X$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.f.X$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -39318,7 +39335,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.f.X$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.f.X$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -39339,21 +39356,21 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.f.X$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.X$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.s.a.a.a.f.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.u.a.a.a.f.Y:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> c
     int firstIntKey() -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> d
     int lastIntKey() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.s.a.a.a.f.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.u.a.a.a.f.a0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap EMPTY_MAP -> a
     1:1:void <clinit>():185:185 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.s.a.a.a.f.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.u.a.a.a.f.Z:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():57 -> a
@@ -39396,7 +39413,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):107:107 -> tailMap
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):141 -> tailMap
     3:3:java.util.SortedMap tailMap(java.lang.Object):57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.s.a.a.a.f.c0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.u.a.a.a.f.c0:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -39442,7 +39459,7 @@
     1:3:int set(int,int):313:315 -> set
     4:4:int set(int,int):313:313 -> set
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.s.a.a.a.f.b0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.u.a.a.a.f.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -39461,7 +39478,7 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.s.a.a.a.f.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.u.a.a.a.f.e0:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -39483,7 +39500,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:6:boolean remove(int):153:158 -> remove
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.s.a.a.a.f.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.u.a.a.a.f.d0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
@@ -39491,18 +39508,18 @@
     1:2:int nextInt():129:130 -> nextInt
     3:3:int nextInt():129:129 -> nextInt
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.s.a.a.a.f.f0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.u.a.a.a.f.f0:
     int[] EMPTY_ARRAY -> a
     1:1:void <clinit>():100:100 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.s.a.a.a.f.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.u.a.a.a.f.g0:
     int previousInt() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.s.a.a.a.f.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.u.a.a.a.f.h0:
     boolean add(int) -> a
     boolean contains(int) -> b
     int[] toIntArray() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.s.a.a.a.f.k0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.u.a.a.a.f.k0:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.s.a.a.a.f.i0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.u.a.a.a.f.i0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):96:96 -> a
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
@@ -39513,7 +39530,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.s.a.a.a.f.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.u.a.a.a.f.j0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):370:370 -> <init>
@@ -39541,17 +39558,17 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.s.a.a.a.f.l0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.s.a.a.a.f.m0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.s.a.a.a.f.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.u.a.a.a.f.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.u.a.a.a.f.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.u.a.a.a.f.q0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.s.a.a.a.f.n0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.u.a.a.a.f.n0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.s.a.a.a.f.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.u.a.a.a.f.o0:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
@@ -39563,24 +39580,24 @@
     1:3:int nextInt():126:128 -> nextInt
     4:4:int nextInt():126:126 -> nextInt
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.s.a.a.a.f.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.u.a.a.a.f.p0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):807:808 -> <init>
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.s.a.a.a.f.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.u.a.a.a.f.r0:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
     int removeInt(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.s.a.a.a.f.s0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.s.a.a.a.f.u0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.u.a.a.a.f.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.u.a.a.a.f.u0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
     1:1:void <clinit>():323:323 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList singleton(int):478:478 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.s.a.a.a.f.t0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.s.a.a.a.f.u0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.u.a.a.a.f.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.u.a.a.a.f.u0$a:
     1:1:void <init>():65:65 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):110:110 -> a
     2:2:boolean add(java.lang.Integer):156:156 -> a
@@ -39624,7 +39641,7 @@
     3:3:int set(int,int):90:90 -> set
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):246:246 -> subList
     1:1:java.util.List subList(int,int):62 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.s.a.a.a.f.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.u.a.a.a.f.v0:
     int element -> a
     1:1:void <init>(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1):332:332 -> <init>
     2:3:void <init>(int):336:337 -> <init>
@@ -39657,7 +39674,7 @@
     1:1:java.util.List subList(int,int):332:332 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):390:393 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):392:392 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.s.a.a.a.f.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.u.a.a.a.f.y0:
     float f -> g
     int size -> f
     int n -> d
@@ -39712,8 +39729,8 @@
     2:5:boolean remove(int):365 -> remove
     6:13:boolean remove(int):369:376 -> remove
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.s.a.a.a.f.w0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.s.a.a.a.f.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.u.a.a.a.f.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.u.a.a.a.f.x0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> f
     int last -> b
@@ -39734,21 +39751,21 @@
     23:23:void remove():532 -> remove
     24:25:void remove():535:536 -> remove
     26:26:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.s.a.a.a.f.z0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.s.a.a.a.f.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.u.a.a.a.f.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.u.a.a.a.f.B0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.s.a.a.a.f.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.u.a.a.a.f.A0:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean rem(int):64:64 -> c
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.s.a.a.a.f.C0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.s.a.a.a.f.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.u.a.a.a.f.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.u.a.a.a.f.E0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():168:168 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.s.a.a.a.f.D0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.u.a.a.a.f.D0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():155:155 -> clone
     1:1:java.lang.Integer first():139:139 -> first
@@ -39764,8 +39781,8 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):39:39 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(java.lang.Integer):128:128 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):39 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.s.a.a.a.f.F0:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.s.a.a.a.g.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.u.a.a.a.f.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.u.a.a.a.g.a:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(long,java.lang.Object) -> a
@@ -39805,7 +39822,7 @@
     11:11:long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry.getLongKey():439:439 -> toString
     11:11:java.lang.String toString():314 -> toString
     12:18:java.lang.String toString():314:320 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongBidirectionalIterator -> com.android.tools.r8.s.a.a.a.g.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongBidirectionalIterator -> com.android.tools.r8.u.a.a.a.g.b:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.<init>():34:34 -> <init>
     1:1:void <init>():34 -> <init>
     long previousLong() -> a
@@ -39816,7 +39833,7 @@
     long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.nextLong() -> nextLong
     1:1:java.lang.Long previous():56:56 -> previous
     1:1:java.lang.Object previous():33 -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongCollection -> com.android.tools.r8.s.a.a.a.g.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongCollection -> com.android.tools.r8.u.a.a.a.g.c:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(long):68:68 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
@@ -39827,7 +39844,7 @@
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList -> com.android.tools.r8.s.a.a.a.g.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList -> com.android.tools.r8.u.a.a.a.g.f:
     1:1:void <init>():33:33 -> <init>
     void add(int,long) -> a
     void removeElements(int,int) -> a
@@ -39902,7 +39919,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator iterator():180 -> toString
     2:2:java.lang.String toString():709 -> toString
     3:14:java.lang.String toString():710:721 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList -> com.android.tools.r8.s.a.a.a.g.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList -> com.android.tools.r8.u.a.a.a.g.e:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList l -> a
     int from -> b
     int to -> c
@@ -39953,7 +39970,7 @@
     1:1:java.util.List subList(int,int):725:725 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList subList(int,int):879:882 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList subList(int,int):881:881 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList$1 -> com.android.tools.r8.s.a.a.a.g.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList$1 -> com.android.tools.r8.u.a.a.a.g.d:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList this$0 -> d
     boolean $assertionsDisabled -> e
     int last -> b
@@ -39975,7 +39992,7 @@
     1:1:int previousIndex():847:847 -> previousIndex
     1:10:void remove():863:872 -> remove
     11:11:void remove():863:863 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongListIterator -> com.android.tools.r8.s.a.a.a.g.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongListIterator -> com.android.tools.r8.u.a.a.a.g.g:
     1:1:void <init>():35:35 -> <init>
     void add(long) -> a
     1:1:void add(java.lang.Object):34:34 -> add
@@ -39985,17 +40002,17 @@
     1:1:void set(java.lang.Object):34:34 -> set
     2:2:void set(java.lang.Long):70:70 -> set
     2:2:void set(java.lang.Object):34 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet -> com.android.tools.r8.s.a.a.a.g.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet -> com.android.tools.r8.u.a.a.a.g.h:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(long):87:87 -> c
     2:4:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet.remove(long):755:757 -> c
     2:4:boolean rem(long):87 -> c
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.s.a.a.a.g.k:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.s.a.a.a.g.i:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.g.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.s.a.a.a.g.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.u.a.a.a.g.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.u.a.a.a.g.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.g.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.u.a.a.a.g.m:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> b
     float f -> h
@@ -40055,7 +40072,7 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.g.l:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
@@ -40063,7 +40080,7 @@
     1:1:java.util.Iterator iterator():794:794 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.g.m$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.g.m$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -40071,13 +40088,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.g.m$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.g.m$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:java.lang.Long next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:long nextLong():727:727 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.g.m$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.g.m$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):737:737 -> <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):737:737 -> <init>
@@ -40086,7 +40103,7 @@
     1:1:java.util.Iterator iterator():737:737 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.g.m$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.g.m$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -40097,7 +40114,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.g.m$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.g.m$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):625:625 -> <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):625:625 -> <init>
@@ -40107,7 +40124,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.g.m$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.g.m$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> e
     int last -> b
@@ -40128,11 +40145,11 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.g.m$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.g.m$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.s.a.a.a.g.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.u.a.a.a.g.o:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -40161,7 +40178,7 @@
     3:4:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.s.a.a.a.g.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.u.a.a.a.g.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -40180,17 +40197,17 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.s.a.a.a.g.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.u.a.a.a.g.p:
     long previousLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.s.a.a.a.g.q:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.s.a.a.a.g.r:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.s.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.u.a.a.a.g.q:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.u.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.u.a.a.a.g.s:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long removeLong(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.s.a.a.a.g.t:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.s.a.a.a.h.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.u.a.a.a.g.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.u.a.a.a.h.b:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     boolean containsValue(boolean) -> a
@@ -40241,7 +40258,7 @@
     17:17:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
     17:17:java.lang.String toString():341 -> toString
     18:21:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.s.a.a.a.h.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.u.a.a.a.h.a:
     java.lang.Object key -> a
     boolean value -> b
     1:3:void <init>(java.lang.Object,boolean):121:123 -> <init>
@@ -40258,7 +40275,7 @@
     3:3:java.lang.Boolean setValue(java.lang.Boolean):162 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
     1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap -> com.android.tools.r8.s.a.a.a.h.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap -> com.android.tools.r8.u.a.a.a.h.d:
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -40291,7 +40308,7 @@
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):0 -> remove
     1:17:java.lang.String toString():328:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap$BasicEntry -> com.android.tools.r8.s.a.a.a.h.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap$BasicEntry -> com.android.tools.r8.u.a.a.a.h.c:
     java.lang.Object key -> a
     int value -> b
     1:3:void <init>(java.lang.Object,int):121:123 -> <init>
@@ -40308,7 +40325,7 @@
     3:3:java.lang.Integer setValue(java.lang.Integer):162 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
     1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap -> com.android.tools.r8.s.a.a.a.h.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap -> com.android.tools.r8.u.a.a.a.h.e:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> entrySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> entrySet
@@ -40322,7 +40339,7 @@
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> entrySet
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> entrySet
     5:6:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.s.a.a.a.h.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.u.a.a.a.h.f:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     boolean containsValue(long) -> a
@@ -40342,6 +40359,15 @@
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
+    2:12:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.getLong(java.lang.Object):371:381 -> get
+    2:12:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):108 -> get
+    2:12:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
+    2:12:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
+    2:12:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
+    13:13:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):108:108 -> get
+    13:13:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
+    13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
+    13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
@@ -40360,7 +40386,7 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.size():429:429 -> toString
     4:4:java.lang.String toString():330 -> toString
     5:16:java.lang.String toString():333:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap -> com.android.tools.r8.s.a.a.a.h.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap -> com.android.tools.r8.u.a.a.a.h.g:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     1:3:boolean equals(java.lang.Object):272:274 -> equals
@@ -40392,20 +40418,20 @@
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.size():761:761 -> toString
     8:8:java.lang.String toString():282 -> toString
     9:21:java.lang.String toString():285:297 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap -> com.android.tools.r8.s.a.a.a.h.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap -> com.android.tools.r8.u.a.a.a.h.h:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():226:226 -> entrySet
     1:1:java.util.Set entrySet():31 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.object2ObjectEntrySet():85:85 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():226 -> entrySet
     2:2:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.s.a.a.a.h.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.u.a.a.a.h.i:
     1:1:void <init>():37:37 -> <init>
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.s.a.a.a.h.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.u.a.a.a.h.j:
     1:1:void <init>():34:34 -> <init>
     1:1:void remove():45:45 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList -> com.android.tools.r8.s.a.a.a.h.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList -> com.android.tools.r8.u.a.a.a.h.m:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:5:boolean addAll(int,java.util.Collection):121:125 -> addAll
@@ -40457,7 +40483,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():181 -> toString
     2:2:java.lang.String toString():503 -> toString
     3:15:java.lang.String toString():504:516 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList -> com.android.tools.r8.s.a.a.a.h.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList -> com.android.tools.r8.u.a.a.a.h.l:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList l -> a
     int from -> b
     int to -> c
@@ -40489,7 +40515,7 @@
     1:1:java.util.List subList(int,int):520:520 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList subList(int,int):674:677 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList subList(int,int):676:676 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.s.a.a.a.h.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.u.a.a.a.h.k:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList this$0 -> d
     boolean $assertionsDisabled -> e
     int last -> b
@@ -40511,18 +40537,18 @@
     11:11:void remove():658:658 -> remove
     1:2:void set(java.lang.Object):653:654 -> set
     3:3:void set(java.lang.Object):653:653 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.s.a.a.a.h.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.u.a.a.a.h.n:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
     1:1:void add(java.lang.Object):57:57 -> add
     1:1:void set(java.lang.Object):46:46 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSet -> com.android.tools.r8.s.a.a.a.h.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSet -> com.android.tools.r8.u.a.a.a.h.o:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSortedSet -> com.android.tools.r8.s.a.a.a.h.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSortedSet -> com.android.tools.r8.u.a.a.a.h.p:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.s.a.a.a.h.q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.u.a.a.a.h.q:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     boolean containsValue(boolean) -> a
@@ -40566,7 +40592,7 @@
     14:14:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.getBooleanValue():442:442 -> toString
     14:14:java.lang.String toString():341 -> toString
     15:18:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.s.a.a.a.h.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.u.a.a.a.h.s:
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -40599,7 +40625,7 @@
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):0 -> remove
     1:17:java.lang.String toString():328:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry -> com.android.tools.r8.s.a.a.a.h.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry -> com.android.tools.r8.u.a.a.a.h.r:
     java.lang.Object key -> a
     int value -> b
     1:3:void <init>(java.lang.Object,int):121:123 -> <init>
@@ -40616,7 +40642,7 @@
     3:3:java.lang.Integer setValue(java.lang.Integer):162 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
     1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap -> com.android.tools.r8.s.a.a.a.h.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap -> com.android.tools.r8.u.a.a.a.h.t:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> entrySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> entrySet
@@ -40630,10 +40656,54 @@
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87 -> entrySet
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> entrySet
     5:6:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.s.a.a.a.h.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap -> com.android.tools.r8.u.a.a.a.h.u:
+    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.<init>():44:44 -> <init>
+    1:1:void <init>():45 -> <init>
+    boolean containsValue(long) -> a
+    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,long) -> a
+    long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.removeLong(java.lang.Object) -> b
+    1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
+    1:1:java.util.Set entrySet():42:42 -> entrySet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> entrySet
+    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():761:762 -> entrySet
+    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> entrySet
+    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> entrySet
+    1:3:boolean equals(java.lang.Object):320:322 -> equals
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.size():429:429 -> equals
+    4:4:boolean equals(java.lang.Object):322 -> equals
+    5:5:boolean equals(java.lang.Object):323:323 -> equals
+    1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):108:108 -> get
+    1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):41 -> get
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
+    2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
+    2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):0 -> put
+    2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):41 -> put
+    2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
+    1:7:void putAll(java.util.Map):82:88 -> putAll
+    8:8:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry.getLongValue():487:487 -> putAll
+    8:8:void putAll(java.util.Map):88 -> putAll
+    9:15:void putAll(java.util.Map):88:94 -> putAll
+    16:17:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):123:124 -> putAll
+    16:17:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):0 -> putAll
+    16:17:void putAll(java.util.Map):94 -> putAll
+    1:3:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):140:142 -> remove
+    1:3:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):0 -> remove
+    1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):41 -> remove
+    1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):0 -> remove
+    1:3:java.lang.String toString():328:330 -> toString
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.size():429:429 -> toString
+    4:4:java.lang.String toString():330 -> toString
+    5:13:java.lang.String toString():333:341 -> toString
+    14:14:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry.getLongValue():487:487 -> toString
+    14:14:java.lang.String toString():341 -> toString
+    15:18:java.lang.String toString():341:344 -> toString
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.u.a.a.a.h.v:
     1:1:void <init>():37:37 -> <init>
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.s.a.a.a.h.x:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.u.a.a.a.h.y:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:5:boolean addAll(int,java.util.Collection):121:125 -> addAll
@@ -40672,7 +40742,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():181 -> toString
     2:2:java.lang.String toString():462 -> toString
     3:15:java.lang.String toString():463:475 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList -> com.android.tools.r8.s.a.a.a.h.w:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList -> com.android.tools.r8.u.a.a.a.h.x:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList l -> a
     int from -> b
     int to -> c
@@ -40703,7 +40773,7 @@
     1:1:java.util.List subList(int,int):479:479 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList subList(int,int):633:636 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList subList(int,int):635:635 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.s.a.a.a.h.v:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.u.a.a.a.h.w:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList this$0 -> d
     int last -> b
@@ -40725,13 +40795,13 @@
     11:11:void remove():617:617 -> remove
     1:2:void set(java.lang.Object):612:613 -> set
     3:3:void set(java.lang.Object):612:612 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.s.a.a.a.h.y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.u.a.a.a.h.z:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.s.a.a.a.h.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.u.a.a.a.h.A:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.s.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.u.a.a.a.h.D:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
@@ -40760,8 +40830,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.s.a.a.a.h.A:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.h.C$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.u.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.h.D$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1):133:133 -> <init>
@@ -40771,7 +40841,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.u.a.a.a.h.C:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -40783,9 +40853,9 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.s.a.a.a.h.D:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.s.a.a.a.h.D$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.s.a.a.a.h.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.u.a.a.a.h.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.u.a.a.a.h.E$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.u.a.a.a.h.H:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -40816,8 +40886,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.s.a.a.a.h.E:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.h.G$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.u.a.a.a.h.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.h.H$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1):133:133 -> <init>
@@ -40827,7 +40897,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.h.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.u.a.a.a.h.G:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -40839,10 +40909,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.s.a.a.a.h.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.u.a.a.a.h.I:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.s.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.u.a.a.a.h.K:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -40920,7 +40990,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.I:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.J:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
@@ -40928,7 +40998,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.J$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.K$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -40943,14 +41013,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> 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):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.J$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.K$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.J$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.K$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -40972,7 +41042,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.J$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.K$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -40991,7 +41061,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.J$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.K$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -41019,7 +41089,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> 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):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.J$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.K$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -41040,7 +41110,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.J$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.K$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -41055,12 +41125,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.s.a.a.a.h.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.u.a.a.a.h.N:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.s.a.a.a.h.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.u.a.a.a.h.L:
     int getIntValue() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.L:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.s.a.a.a.h.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.u.a.a.a.h.P:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> b
@@ -41122,7 +41192,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.N:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.O:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
@@ -41130,7 +41200,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.O$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.P$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -41138,11 +41208,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.O$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.P$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.O$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.P$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):785:785 -> <init>
@@ -41152,7 +41222,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.O$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.P$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -41171,7 +41241,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.O$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.P$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):679:679 -> <init>
@@ -41181,7 +41251,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.O$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.P$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     int last -> b
@@ -41202,18 +41272,18 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.O$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.P$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     1:1:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.s.a.a.a.h.P:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.s.a.a.a.h.Q:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.s.a.a.a.h.Q$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.u.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.u.a.a.a.h.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.u.a.a.a.h.S$a:
     long getLongValue() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.S:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.s.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.u.a.a.a.h.V:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     float f -> h
     java.lang.Object[] key -> a
@@ -41240,9 +41310,8 @@
     20:20:int realSize():205:205 -> b
     20:20:void rehash(int):968 -> b
     21:33:void rehash(int):969:981 -> b
-    1:11:long getLong(java.lang.Object):371:381 -> c
-    12:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet object2LongEntrySet():761:762 -> c
-    12:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> c
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet object2LongEntrySet():761:762 -> c
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> c
     1:4:void clear():421:424 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap clone():999:1008 -> clone
     1:10:java.lang.Object clone():49 -> clone
@@ -41276,7 +41345,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.U:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):848:848 -> <init>
     1:1:boolean contains(long):861:861 -> b
@@ -41284,7 +41353,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.U$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.V$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -41292,11 +41361,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.U$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.V$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.U$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.V$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):785:785 -> <init>
@@ -41306,7 +41375,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.U$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.V$d:
     int index -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -41325,7 +41394,7 @@
     5:5:java.lang.Long setValue(java.lang.Long):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.U$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.V$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):679:679 -> <init>
@@ -41335,7 +41404,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.U$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.V$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> f
     int last -> b
@@ -41356,13 +41425,13 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.U$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.V$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     1:1:java.lang.Long next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:long nextLong():836:836 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.s.a.a.a.h.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.u.a.a.a.h.X:
     float f -> l
     java.lang.Object[] value -> b
     int maxFill -> j
@@ -41437,7 +41506,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1529:1550 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.s.a.a.a.h.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.u.a.a.a.h.W:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1529:1529 -> <init>
     1:1:void clear():1547:1547 -> clear
@@ -41445,7 +41514,7 @@
     1:1:java.util.Iterator iterator():1529:1529 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.W$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.X$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -41460,14 +41529,14 @@
     1:1:void set(java.lang.Object):1178:1178 -> 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):1170:1170 -> set
     2:2:void set(java.lang.Object):1178 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.W$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.X$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1412:1413 -> <init>
     1:1:void add(java.lang.Object):1409:1409 -> add
     1:1:java.lang.Object next():1418:1418 -> next
     1:1:java.lang.Object previous():1399:1399 -> previous
     1:1:void set(java.lang.Object):1404:1404 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.W$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.X$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1422:1422 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1422:1422 -> <init>
@@ -41489,7 +41558,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1422 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):1472:1472 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1422 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.W$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.X$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -41499,7 +41568,7 @@
     1:1:int hashCode():839:839 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):824:825 -> setValue
     1:1:java.lang.String toString():844:844 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.W$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.X$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1228:1228 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1228:1228 -> <init>
@@ -41527,7 +41596,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1228:1228 -> 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):1250:1250 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1228 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.W$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.X$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -41548,17 +41617,17 @@
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1144:1144 -> remove
     51:51:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.W$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.X$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1517:1518 -> <init>
     1:1:void add(java.lang.Object):1514:1514 -> add
     1:1:java.lang.Object next():1523:1523 -> next
     1:1:java.lang.Object previous():1504:1504 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.s.a.a.a.h.Y:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.s.a.a.a.h.X:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.s.a.a.a.h.Z:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.s.a.a.a.h.b0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.u.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.u.a.a.a.h.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.u.a.a.a.h.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.u.a.a.a.h.c0:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -41586,7 +41655,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.s.a.a.a.h.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.u.a.a.a.h.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -41605,7 +41674,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.s.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.u.a.a.a.h.e0:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):29:29 -> a
@@ -41625,7 +41694,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.s.a.a.a.h.c0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.u.a.a.a.h.d0:
     int next -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
@@ -41633,16 +41702,16 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.s.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.u.a.a.a.h.f0:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():88:88 -> <clinit>
     1:2:java.lang.Object[] grow(java.lang.Object[],int,int):213:214 -> a
     3:5:java.lang.Object[] newArray(java.lang.Object[],int):106:108 -> a
     3:5:java.lang.Object[] grow(java.lang.Object[],int,int):215 -> a
     6:6:java.lang.Object[] grow(java.lang.Object[],int,int):216:216 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.s.a.a.a.h.f0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.s.a.a.a.h.g0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.s.a.a.a.h.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.u.a.a.a.h.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.u.a.a.a.h.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.u.a.a.a.h.i0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -41653,37 +41722,37 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.s.a.a.a.h.i0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.s.a.a.a.h.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.u.a.a.a.h.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.u.a.a.a.h.m0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.s.a.a.a.h.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.u.a.a.a.h.k0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:java.lang.Object next():57:57 -> next
     1:1:java.lang.Object previous():62:62 -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.s.a.a.a.h.k0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.u.a.a.a.h.l0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):739:740 -> <init>
     1:1:boolean hasNext():745:745 -> hasNext
     1:1:java.lang.Object next():750:750 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.s.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.u.a.a.a.h.n0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.s.a.a.a.h.n0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.s.a.a.a.h.o0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.s.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.u.a.a.a.h.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.u.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.u.a.a.a.h.r0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.s.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.u.a.a.a.h.q0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.s.a.a.a.h.r0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.s.a.a.a.h.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.u.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.u.a.a.a.h.u0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():114:114 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.s.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.u.a.a.a.h.t0:
     1:1:void <init>():43:43 -> <init>
     1:1:java.lang.Object clone():101:101 -> clone
     1:1:java.lang.Object first():86:86 -> first
@@ -41694,10 +41763,10 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):40 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):81:81 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):40 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.s.a.a.a.h.w0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.s.a.a.a.h.u0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.v0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.s.a.a.a.h.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.u.a.a.a.h.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.u.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.u.a.a.a.h.z0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     float f -> h
     java.lang.Object[] key -> a
@@ -41758,7 +41827,7 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.y0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):803:803 -> <init>
     1:1:boolean contains(boolean):816:816 -> b
@@ -41766,7 +41835,7 @@
     1:1:java.util.Iterator iterator():803:803 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.y0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.z0$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -41774,11 +41843,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry next():614:614 -> next
     1:1:java.lang.Object next():609 -> next
     1:2:void remove():619:620 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.y0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.z0$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):730:731 -> <init>
     1:1:java.lang.Object next():736:736 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.y0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.z0$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):740:740 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):740:740 -> <init>
@@ -41788,7 +41857,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.y0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.z0$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -41806,7 +41875,7 @@
     5:5:java.lang.Boolean setValue(java.lang.Boolean):473:473 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):423 -> setValue
     1:1:java.lang.String toString():491:491 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.y0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.z0$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):634:634 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):634:634 -> <init>
@@ -41816,7 +41885,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.y0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.z0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -41837,13 +41906,13 @@
     24:24:void remove():589 -> remove
     25:26:void remove():592:593 -> remove
     27:27:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.y0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.z0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:java.lang.Boolean next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
     1:1:boolean nextBoolean():791:791 -> nextBoolean
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.s.a.a.a.h.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.u.a.a.a.h.C0:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -41872,8 +41941,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.s.a.a.a.h.z0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.h.B0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.u.a.a.a.h.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.h.C0$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1):133:133 -> <init>
@@ -41883,7 +41952,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.h.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.u.a.a.a.h.B0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -41895,10 +41964,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.s.a.a.a.h.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.u.a.a.a.h.D0:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.s.a.a.a.h.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.u.a.a.a.h.F0:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -41975,7 +42044,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.D0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.E0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
@@ -41983,7 +42052,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.E0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.F0$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -41998,14 +42067,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> 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):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.E0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.F0$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.E0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.F0$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1465:1465 -> <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):1465:1465 -> <init>
@@ -42027,7 +42096,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.E0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.F0$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -42046,7 +42115,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.E0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.F0$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1269:1269 -> <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):1269:1269 -> <init>
@@ -42074,7 +42143,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> 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):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.E0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.F0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -42095,7 +42164,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.E0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.F0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -42110,12 +42179,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.s.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.u.a.a.a.h.G0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.s.a.a.a.h.F0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.u.a.a.a.h.G0$a:
     int getIntValue() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.G0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.s.a.a.a.h.I0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.u.a.a.a.h.J0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> b
@@ -42179,7 +42248,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.I0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
@@ -42187,7 +42256,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.I0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.J0$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -42195,11 +42264,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.I0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.J0$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.I0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.J0$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):785:785 -> <init>
@@ -42209,7 +42278,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.I0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.J0$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -42228,7 +42297,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.I0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.J0$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):679:679 -> <init>
@@ -42238,7 +42307,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.I0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.J0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -42259,14 +42328,162 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.I0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.J0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.s.a.a.a.h.J0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.s.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.u.a.a.a.h.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap -> com.android.tools.r8.u.a.a.a.h.N0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.u.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.u.a.a.a.h.P0:
+    float f -> h
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> i
+    java.lang.Object[] key -> a
+    long[] value -> b
+    int maxFill -> f
+    int size -> g
+    com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection values -> k
+    int n -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> j
+    int mask -> c
+    boolean containsNullKey -> d
+    1:9:void <init>(int,float):91:99 -> <init>
+    10:10:void <init>(int,float):93:93 -> <init>
+    11:11:void <init>(int,float):92:92 -> <init>
+    1:1:long access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):49:49 -> a
+    2:2:long access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):49:49 -> a
+    3:18:int insert(java.lang.Object,long):248:263 -> a
+    3:18:long put(java.lang.Object,long):270 -> a
+    19:20:long put(java.lang.Object,long):272:273 -> a
+    21:25:boolean containsValue(long):404:408 -> a
+    1:12:long removeLong(java.lang.Object):353:364 -> b
+    13:19:void rehash(int):961:967 -> b
+    20:20:int realSize():205:205 -> b
+    20:20:void rehash(int):968 -> b
+    21:33:void rehash(int):969:981 -> b
+    1:5:long removeNullEntry():227:231 -> c
+    6:16:long getLong(java.lang.Object):371:381 -> c
+    1:4:void clear():421:424 -> clear
+    1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap clone():999:1008 -> clone
+    1:10:java.lang.Object clone():49 -> clone
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap clone():1001:1001 -> clone
+    11:11:java.lang.Object clone():49 -> clone
+    1:10:boolean containsKey(java.lang.Object):388:397 -> containsKey
+    1:2:long removeEntry(int):219:220 -> e
+    3:8:void shiftKeys(int):333:338 -> e
+    3:8:long removeEntry(int):221 -> e
+    9:9:long removeEntry(int):222:222 -> e
+    10:15:void shiftKeys(int):341:346 -> e
+    10:15:long removeEntry(int):221 -> e
+    16:16:void shiftKeys(int):343:343 -> e
+    16:16:long removeEntry(int):221 -> e
+    1:1:int realSize():205:205 -> hashCode
+    1:1:int hashCode():1025 -> hashCode
+    2:10:int hashCode():1026:1034 -> hashCode
+    1:1:boolean isEmpty():434:434 -> isEmpty
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():816:817 -> keySet
+    1:2:java.util.Set keySet():49 -> keySet
+    1:1:void putAll(java.util.Map):237:237 -> putAll
+    2:3:void ensureCapacity(int):209:210 -> putAll
+    2:3:void putAll(java.util.Map):237 -> putAll
+    4:4:int size():429:429 -> putAll
+    4:4:void putAll(java.util.Map):239 -> putAll
+    5:5:void putAll(java.util.Map):239:239 -> putAll
+    6:7:void tryCapacity(long):214:215 -> putAll
+    6:7:void putAll(java.util.Map):239 -> putAll
+    8:8:void putAll(java.util.Map):242:242 -> putAll
+    1:1:int size():429:429 -> size
+    1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection values():848:869 -> values
+    1:22:java.util.Collection values():49 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.O0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):848:848 -> <init>
+    1:1:boolean contains(long):861:861 -> b
+    1:1:void clear():866:866 -> clear
+    1:1:java.util.Iterator iterator():848:848 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> iterator
+    1:1:int size():856:856 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.P0$a:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> g
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):654:654 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry next():659:659 -> next
+    1:1:java.lang.Object next():654 -> next
+    1:2:void remove():664:665 -> remove
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.P0$b:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):775:776 -> <init>
+    1:1:java.lang.Object next():781:781 -> next
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.P0$c:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):785:785 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):785:785 -> <init>
+    1:1:void clear():810:810 -> clear
+    1:1:boolean contains(java.lang.Object):798:798 -> contains
+    1:1:java.util.Iterator iterator():785:785 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
+    1:3:boolean remove(java.lang.Object):803:805 -> remove
+    1:1:int size():793:793 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.P0$d:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
+    int index -> a
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
+    1:3:boolean equals(java.lang.Object):524:526 -> equals
+    1:1:java.lang.Object getKey():482:482 -> getKey
+    1:1:java.lang.Long getValue():506:506 -> getValue
+    1:1:java.lang.Object getValue():468 -> getValue
+    1:1:int hashCode():531:531 -> hashCode
+    1:1:java.lang.Object setValue(java.lang.Object):468:468 -> setValue
+    2:2:java.lang.Long setValue(java.lang.Long):518:518 -> setValue
+    2:2:java.lang.Object setValue(java.lang.Object):468 -> setValue
+    3:4:long setValue(long):492:493 -> setValue
+    3:4:java.lang.Long setValue(java.lang.Long):518 -> setValue
+    3:4:java.lang.Object setValue(java.lang.Object):468 -> setValue
+    5:5:java.lang.Long setValue(java.lang.Long):518:518 -> setValue
+    5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
+    1:1:java.lang.String toString():536:536 -> toString
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.P0$e:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):679:679 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):679:679 -> <init>
+    1:1:void clear():755:755 -> clear
+    1:16:boolean contains(java.lang.Object):691:706 -> contains
+    1:1:java.util.Iterator iterator():679:679 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
+    1:29:boolean remove(java.lang.Object):713:741 -> remove
+    1:1:int size():750:750 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.P0$f:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
+    int last -> b
+    int pos -> a
+    boolean mustReturnNullKey -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> f
+    1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):541:564 -> <init>
+    25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):541:541 -> <init>
+    1:18:int nextEntry():576:593 -> c
+    19:19:int nextEntry():576:576 -> c
+    1:1:boolean hasNext():572:572 -> hasNext
+    1:5:void remove():630:634 -> remove
+    6:11:void shiftKeys(int):608:613 -> remove
+    6:11:void remove():634 -> remove
+    12:13:void remove():641:642 -> remove
+    14:23:void shiftKeys(int):616:625 -> remove
+    14:23:void remove():634 -> remove
+    24:24:void shiftKeys(int):618:618 -> remove
+    24:24:void remove():634 -> remove
+    25:26:void remove():637:638 -> remove
+    27:27:void remove():630:630 -> remove
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.P0$g:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
+    1:1:java.lang.Long next():842:842 -> next
+    1:1:java.lang.Object next():829 -> next
+    1:1:long nextLong():836:836 -> nextLong
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.u.a.a.a.h.R0:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -42294,7 +42511,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.s.a.a.a.h.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.u.a.a.a.h.Q0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -42313,7 +42530,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.s.a.a.a.h.N0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.u.a.a.a.h.T0:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):29:29 -> a
@@ -42333,7 +42550,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.s.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.u.a.a.a.h.S0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
@@ -42341,10 +42558,10 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.s.a.a.a.h.O0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.s.a.a.a.h.R0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.u.a.a.a.h.U0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.u.a.a.a.h.X0:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.s.a.a.a.h.P0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.u.a.a.a.h.V0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -42354,7 +42571,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.s.a.a.a.h.Q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.u.a.a.a.h.W0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):277:277 -> <init>
@@ -42377,9 +42594,9 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.s.a.a.a.h.S0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.u.a.a.a.h.Y0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.s.a.a.a.h.U0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.u.a.a.a.h.a1:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -42429,8 +42646,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.s.a.a.a.h.T0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.s.a.a.a.h.U0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.u.a.a.a.h.Z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.u.a.a.a.h.a1$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -42451,17 +42668,17 @@
     23:23:void remove():500 -> remove
     24:25:void remove():503:504 -> remove
     26:26:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.s.a.a.a.h.V0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.s.a.a.a.h.X0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.u.a.a.a.h.b1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.u.a.a.a.h.d1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.s.a.a.a.h.W0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.u.a.a.a.h.c1:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.s.a.a.a.h.Y0:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.t.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.u.a.a.a.h.e1:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.v.b:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -42532,9 +42749,9 @@
     11:15:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:121 -> b
     16:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:130 -> b
     28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):124:124 -> b
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.t.a:
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.v.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jar.InliningConstraintVisitor -> com.android.tools.r8.t.c:
+com.android.tools.r8.jar.InliningConstraintVisitor -> com.android.tools.r8.v.c:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):213:213 -> a
@@ -42544,16 +42761,16 @@
     65:65:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):199 -> a
     66:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):200:216 -> a
     83:83:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLense):221:221 -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.u.a.a:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.w.a.a:
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):63:63 -> <init>
-com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.u.a.b:
+com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.w.a.b:
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.u.a.c:
-com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.u.a.d:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.w.a.c:
+com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.w.a.d:
     1:38:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:37 -> a
     1:38:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
     39:39:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):36:36 -> a
@@ -42568,16 +42785,16 @@
     64:64:void com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.<init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55:55 -> a
     64:64: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 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
-com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.u.a.e:
-com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.u.a.f:
+com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.w.a.e:
+com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.w.a.f:
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode PUBLICATION -> b
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode NONE -> c
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode SYNCHRONIZED -> a
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.u.a.g:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.w.a.g:
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.u.a.h:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.w.a.h:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:1:void <init>(java.lang.Object,java.lang.Object):26:26 -> <init>
@@ -42586,7 +42803,7 @@
     1:1:java.lang.Object getFirst():27:27 -> c
     1:1:java.lang.Object getSecond():28:28 -> d
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.u.a.i:
+com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.w.a.i:
     java.util.concurrent.atomic.AtomicReferenceFieldUpdater valueUpdater -> c
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -42596,7 +42813,7 @@
     1:1:boolean isInitialized():117:117 -> toString
     1:1:java.lang.String toString():119 -> toString
     2:2:java.lang.String toString():119:119 -> toString
-com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.u.a.j:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.w.a.j:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
     java.lang.Object lock -> c
@@ -42607,19 +42824,19 @@
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
-com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.u.a.k:
+com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.w.a.k:
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.u.a.l:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.w.a.l:
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.u.a.m:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.w.a.m:
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.u.a.n:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.w.a.n:
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.u.a.o:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.w.a.o:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):74:76 -> <init>
@@ -42628,10 +42845,10 @@
     1:1:boolean isInitialized():88:88 -> toString
     1:1:java.lang.String toString():90 -> toString
     2:2:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.u.a.p:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.w.a.p:
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.u.a.q.b:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.w.a.q.b:
     1:1:void <init>():13:13 -> <init>
     int getSize() -> a
     1:2:boolean contains(java.lang.Object):40:41 -> contains
@@ -42644,11 +42861,11 @@
     1:1:java.lang.Object[] toArray():31:31 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):37:37 -> toArray
     1:1:java.lang.String toString():24:24 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.u.a.q.a:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.w.a.q.a:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection this$0 -> a
     1:1:java.lang.CharSequence invoke(java.lang.Object):25:25 -> a
     1:1:java.lang.Object invoke(java.lang.Object):13 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.u.a.q.d:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.w.a.q.d:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion Companion -> a
     1:1:void <init>():20:20 -> <init>
     1:3:boolean equals(java.lang.Object):60:62 -> equals
@@ -42664,10 +42881,10 @@
     1:1:java.util.ListIterator listIterator():30:30 -> listIterator
     2:2:java.util.ListIterator listIterator(int):32:32 -> listIterator
     1:1:java.util.List subList(int,int):34:34 -> subList
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion -> com.android.tools.r8.u.a.q.c:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion -> com.android.tools.r8.w.a.q.c:
     1:1:void <init>():104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):104:104 -> <init>
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$IteratorImpl -> com.android.tools.r8.u.a.q.d$a:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$IteratorImpl -> com.android.tools.r8.w.a.q.d$a:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> b
     int index -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):70:70 -> <init>
@@ -42678,7 +42895,7 @@
     2:2:boolean hasNext():74 -> hasNext
     1:2:java.lang.Object next():77:78 -> next
     3:3:java.lang.Object next():77:77 -> next
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.u.a.q.d$b:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.w.a.q.d$b:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int):85:89 -> <init>
     6:6:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkPositionIndex$kotlin_stdlib(int,int):113:113 -> <init>
@@ -42688,7 +42905,7 @@
     1:2:java.lang.Object previous():97:98 -> previous
     3:3:java.lang.Object previous():97:97 -> previous
     1:1:int previousIndex():101:101 -> previousIndex
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.android.tools.r8.u.a.q.e:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.android.tools.r8.w.a.q.e:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList list -> c
     int fromIndex -> d
     int _size -> b
@@ -42701,7 +42918,7 @@
     1:3:java.lang.Object get(int):45:47 -> get
     4:4:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkElementIndex$kotlin_stdlib(int,int):107:107 -> get
     4:4:java.lang.Object get(int):45 -> get
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.u.a.q.f:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.w.a.q.f:
     1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:149 -> a
     1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0 -> a
     151:313:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:162 -> a
@@ -42799,8 +43016,8 @@
     1210:1210:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> d
     1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):0:1387 -> e
     1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.withIndex(java.lang.Iterable):0 -> e
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.u.a.q.g:
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.u.a.q.h:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.w.a.q.g:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.w.a.q.h:
     int[] $this_asList -> b
     1:1:void <init>(int[]):162:162 -> <init>
     1:1:int getSize():163:163 -> a
@@ -42845,12 +43062,12 @@
     13831:13832:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847:1848 -> lastIndexOf
     13831:13832:int lastIndexOf(int):168 -> lastIndexOf
     13831:13832:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.u.a.q.i:
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.u.a.q.j:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.w.a.q.i:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.w.a.q.j:
     java.lang.Iterable $this_withIndex -> a
     1:1:java.util.Iterator invoke():1387:1387 -> a
     1:1:java.lang.Object invoke():0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.u.a.q.k:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.w.a.q.k:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -42858,7 +43075,7 @@
     1:1:java.lang.Object next():13 -> next
     1:1:java.lang.Void previous():19:19 -> previous
     1:1:java.lang.Object previous():13 -> previous
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.u.a.q.l:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.w.a.q.l:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -42880,7 +43097,7 @@
     2:2:java.util.ListIterator listIterator(int):42:42 -> listIterator
     3:3:java.util.ListIterator listIterator(int):41:41 -> listIterator
     1:1:java.util.List subList(int,int):47:47 -> subList
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.u.a.q.m:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.w.a.q.m:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -42894,7 +43111,7 @@
     1:1:java.util.Set keySet():13 -> keySet
     1:1:java.util.Collection getValues():28:28 -> values
     1:1:java.util.Collection values():13 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.u.a.q.n:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.w.a.q.n:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -42904,17 +43121,17 @@
     1:1:boolean containsAll(java.util.Collection):22:22 -> containsAll
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:java.util.Iterator iterator():24:24 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.u.a.q.o:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.w.a.q.o:
     java.lang.Object value -> b
     int index -> a
     1:1:void <init>(int,java.lang.Object):14:14 -> <init>
     1:1:int getIndex():14:14 -> a
     1:1:java.lang.Object getValue():14:14 -> b
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.u.a.q.p:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.w.a.q.p:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):24:24 -> <init>
     1:1:java.util.Iterator iterator():25:25 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.u.a.q.q:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.w.a.q.q:
     java.util.Iterator iterator -> b
     int index -> a
     1:1:void <init>(java.util.Iterator):37:37 -> <init>
@@ -42925,27 +43142,27 @@
     2:2:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.throwIndexOverflow():0 -> next
     2:2:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue next():40 -> next
     2:2:java.lang.Object next():37 -> next
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.u.a.r.a:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.w.a.r.a:
     1:1:int mod(int,int):10:10 -> a
     2:2:int differenceModulo(int,int,int):21:21 -> a
     2:2:int getProgressionLastElement(int,int,int):46 -> a
     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.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.u.a.s.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.w.a.s.a:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.u.a.s.b.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.w.a.s.b.a:
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.u.a.s.b.b:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.w.a.s.b.b:
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.u.a.s.b.c:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.w.a.s.b.c:
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.u.a.s.c.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.w.a.s.c.a:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver INSTANCE -> a
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver access$000():39:39 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.u.a.s.c.b:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.w.a.s.c.b:
     java.lang.Class jClass -> a
     1:1:void <init>(java.lang.Class):10:10 -> <init>
     1:1:java.lang.Class getJClass():10:10 -> a
@@ -42955,7 +43172,7 @@
     2:2:java.lang.Class getJClass():10:10 -> toString
     2:2:java.lang.String toString():88 -> toString
     3:3:java.lang.String toString():88:88 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.u.a.s.c.c:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.w.a.s.c.c:
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():130:130 -> <clinit>
     1:4:java.lang.Object[] toArray(java.util.Collection):83:86 -> a
@@ -42967,8 +43184,8 @@
     261:264:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):43:46 -> a
     265:265:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):39:39 -> a
     266:266:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):30:30 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.u.a.s.c.d:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.u.a.s.c.e:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.w.a.s.c.d:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.w.a.s.c.e:
     int compare(int,int) -> a
     1:1:void throwNpe():37:37 -> a
     2:2:void throwUninitializedPropertyAccessException(java.lang.String):49:49 -> a
@@ -42981,10 +43198,10 @@
     7:18:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):237 -> a
     1:15:void throwParameterIsNullException(java.lang.String):127:141 -> b
     1:15:void checkParameterIsNotNull(java.lang.Object,java.lang.String):116 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.u.a.s.c.f:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.w.a.s.c.f:
     1:1:void <init>(int):10:10 -> <init>
     1:1:java.lang.String toString():11:11 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.u.a.s.c.h:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.w.a.s.c.h:
     com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.reflected -> a
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.receiver -> b
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.NO_RECEIVER -> c
@@ -43012,7 +43229,7 @@
     5:11:boolean equals(java.lang.Object):45:51 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:6:java.lang.String toString():63:68 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.u.a.s.c.g:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.w.a.s.c.g:
     com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer owner -> d
     java.lang.String signature -> f
     java.lang.String name -> e
@@ -43038,7 +43255,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25 -> e
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> e
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.u.a.s.c.i:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.w.a.s.c.i:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():22:30 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):50:50 -> a
@@ -43054,9 +43271,9 @@
     7:7:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):0:0 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.u.a.s.c.j:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.w.a.s.c.j:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.u.a.t.b:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.w.a.t.b:
     com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion Companion -> d
     int last -> b
     int step -> c
@@ -43073,10 +43290,10 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator iterator():99:99 -> iterator
     1:1:java.util.Iterator iterator():72 -> iterator
     1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.u.a.t.a:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.w.a.t.a:
     1:1:void <init>():113:113 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):113:113 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.u.a.t.c:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.w.a.t.c:
     int step -> d
     boolean hasNext -> b
     int next -> c
@@ -43101,7 +43318,7 @@
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0:0 -> remove
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0 -> remove
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.u.a.t.e:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.w.a.t.e:
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> e
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> f
     1:1:void <clinit>():58:58 -> <clinit>
@@ -43111,33 +43328,33 @@
     1:1:int hashCode():52:52 -> hashCode
     1:1:boolean isEmpty():45:45 -> isEmpty
     1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.u.a.t.d:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.w.a.t.d:
     1:1:void <init>():56:56 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):56:56 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.u.a.t.f:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.w.a.t.f:
     1:1:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):1024:1024 -> a
     1:1:int coerceIn(int,int,int):0 -> a
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.u.a.t.g:
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.u.a.u.a:
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.u.a.u.b:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.u.a.u.e:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.u.a.u.d:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.u.a.u.c:
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.u.a.v.a:
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.u.a.v.c:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.w.a.t.g:
+com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.w.a.u.a:
+com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.w.a.u.b:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.w.a.u.e:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.w.a.u.d:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.w.a.u.c:
+com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.w.a.v.a:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.w.a.v.c:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 transformer -> b
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):168:168 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 access$getTransformer$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> b
     1:1:java.util.Iterator iterator():169:169 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.u.a.v.b:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.w.a.v.b:
     java.util.Iterator iterator -> a
     com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence this$0 -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):169:170 -> <init>
     1:1:boolean hasNext():176:176 -> hasNext
     1:1:java.lang.Object next():172:172 -> next
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.u.a.w.b:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.w.a.w.b:
     java.lang.CharSequence input -> a
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
     int startIndex -> b
@@ -43148,7 +43365,7 @@
     1:1:int access$getLimit$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> c
     1:1:int access$getStartIndex$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> d
     1:1:java.util.Iterator iterator():1079:1079 -> iterator
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.u.a.w.a:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.w.a.w.a:
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange nextItem -> d
     com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence this$0 -> f
     int counter -> e
@@ -43175,7 +43392,7 @@
     9:9:java.lang.Object next():1079 -> next
     10:10:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange next():1114:1114 -> next
     10:10:java.lang.Object next():1079 -> next
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.u.a.w.c:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.w.a.w.c:
     1:62:void com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt.appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:61 -> a
     1:62:void appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
     63:63:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
@@ -43255,11 +43472,11 @@
     8231:8812:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):840:1421 -> a
     8813:8814:boolean com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt.equals(char,char,boolean):35:36 -> a
     8813:8814:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):842 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.u.a.w.d:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.u.a.w.e:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.u.a.w.f:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.u.a.w.g:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.u.a.w.h:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.w.a.w.d:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.w.a.w.e:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.w.a.w.f:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.w.a.w.g:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.w.a.w.h:
     char[] $delimiters -> a
     boolean $ignoreCase -> b
     1:1145:com.android.tools.r8.jetbrains.kotlin.Pair invoke(java.lang.CharSequence,int):0:1144 -> a
@@ -43267,7 +43484,7 @@
     1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
     1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair invoke(java.lang.CharSequence,int):1144 -> a
     1146:1146:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.u.a.w.i:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.w.a.w.i:
     java.lang.CharSequence $this_splitToSequence -> a
     1:1219:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1218 -> a
     1:1219:java.lang.Object invoke(java.lang.Object):0 -> a
@@ -43288,8 +43505,8 @@
     1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361:361 -> a
     1224:1224:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
     1224:1224:java.lang.Object invoke(java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.u.a.w.j:
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.u.b.a.c:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.w.a.w.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.w.b.a.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_OPEN -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_ABSTRACT -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_PRIVATE -> d
@@ -43321,25 +43538,25 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):41:41 -> <init>
     1:1:boolean invoke(int):52:52 -> a
     1:1:int plus$kotlinx_metadata(int):46:46 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.u.b.a.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.w.b.a.a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
     1:7:void <clinit>():424:430 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.u.b.a.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.w.b.a.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_REIFIED -> a
     1:1:void <clinit>():441:441 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.u.b.a.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.w.b.a.d:
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.u.b.a.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.w.b.a.e:
     java.util.Map arguments -> b
     java.lang.String className -> a
     1:1:void <init>(java.lang.String,java.util.Map):18:18 -> <init>
     1:1:java.util.Map getArguments():18:18 -> a
     1:1:java.lang.String getClassName():18:18 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.u.b.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.w.b.a.w:
     1:1:void <init>():25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.u.b.a.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.w.b.a.f:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation value -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):51:51 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> a
@@ -43354,7 +43571,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.u.b.a.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.w.b.a.g:
     java.util.List value -> a
     1:1:void <init>(java.util.List):52:52 -> <init>
     1:1:java.util.List getValue():52:52 -> a
@@ -43369,7 +43586,7 @@
     1:1:java.util.List getValue():52:52 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.u.b.a.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.w.b.a.h:
     boolean value -> a
     1:1:void <init>(boolean):38:38 -> <init>
     1:1:java.lang.Boolean getValue():38:38 -> a
@@ -43385,7 +43602,7 @@
     1:1:java.lang.Boolean getValue():38:38 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.u.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.w.b.a.i:
     byte value -> a
     1:1:void <init>(byte):31:31 -> <init>
     1:1:java.lang.Byte getValue():31:31 -> a
@@ -43401,7 +43618,7 @@
     1:1:java.lang.Byte getValue():31:31 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.u.b.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.w.b.a.j:
     char value -> a
     1:1:void <init>(char):32:32 -> <init>
     1:1:java.lang.Character getValue():32:32 -> a
@@ -43417,7 +43634,7 @@
     1:1:java.lang.Character getValue():32:32 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.u.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.w.b.a.k:
     double value -> a
     1:1:void <init>(double):37:37 -> <init>
     1:1:java.lang.Double getValue():37:37 -> a
@@ -43433,13 +43650,13 @@
     1:1:java.lang.Double getValue():37:37 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.u.b.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.w.b.a.l:
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
     1:2:void <init>(java.lang.String,java.lang.String):47:48 -> <init>
     1:1:java.lang.String getEnumClassName():47:47 -> a
     1:1:java.lang.String getEnumEntryName():47:47 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.u.b.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.w.b.a.m:
     float value -> a
     1:1:void <init>(float):36:36 -> <init>
     1:1:java.lang.Float getValue():36:36 -> a
@@ -43455,7 +43672,7 @@
     1:1:java.lang.Float getValue():36:36 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.u.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.w.b.a.n:
     int value -> a
     1:1:void <init>(int):34:34 -> <init>
     1:1:java.lang.Integer getValue():34:34 -> a
@@ -43471,7 +43688,7 @@
     1:1:java.lang.Integer getValue():34:34 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.u.b.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.w.b.a.o:
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     1:1:java.lang.String getValue():46:46 -> a
@@ -43486,7 +43703,7 @@
     1:1:java.lang.String getValue():46:46 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.u.b.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.w.b.a.p:
     long value -> a
     1:1:void <init>(long):35:35 -> <init>
     1:1:java.lang.Long getValue():35:35 -> a
@@ -43502,7 +43719,7 @@
     1:1:java.lang.Long getValue():35:35 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.u.b.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.w.b.a.q:
     short value -> a
     1:1:void <init>(short):33:33 -> <init>
     1:1:java.lang.Short getValue():33:33 -> a
@@ -43518,7 +43735,7 @@
     1:1:java.lang.Short getValue():33:33 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.u.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.w.b.a.r:
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
     1:1:java.lang.String getValue():45:45 -> a
@@ -43533,7 +43750,7 @@
     1:1:java.lang.String getValue():45:45 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.u.b.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.w.b.a.s:
     byte value -> a
     1:1:void <init>(byte):40:40 -> <init>
     1:1:java.lang.Byte getValue():40:40 -> a
@@ -43549,7 +43766,7 @@
     1:1:java.lang.Byte getValue():40:40 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.u.b.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.w.b.a.t:
     int value -> a
     1:1:void <init>(int):42:42 -> <init>
     1:1:java.lang.Integer getValue():42:42 -> a
@@ -43565,7 +43782,7 @@
     1:1:java.lang.Integer getValue():42:42 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.u.b.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.w.b.a.u:
     long value -> a
     1:1:void <init>(long):43:43 -> <init>
     1:1:java.lang.Long getValue():43:43 -> a
@@ -43581,7 +43798,7 @@
     1:1:java.lang.Long getValue():43:43 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.u.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.w.b.a.v:
     short value -> a
     1:1:void <init>(short):41:41 -> <init>
     1:1:java.lang.Short getValue():41:41 -> a
@@ -43597,7 +43814,7 @@
     1:1:java.lang.Short getValue():41:41 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.u.b.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.w.b.a.x:
     java.util.List extensions -> o
     java.lang.String companionObject -> j
     int flags -> b
@@ -43668,8 +43885,8 @@
     1:1:java.util.List getFunctions():59:59 -> e
     1:1:java.util.List getProperties():64:64 -> f
     1:1:java.util.List getSupertypes():54:54 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.u.b.a.y:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.u.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.w.b.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.w.b.a.z:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
     void visitCompanionObject(java.lang.String) -> a
@@ -43685,26 +43902,26 @@
     void visitNestedClass(java.lang.String) -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> c
     void visitSealedSubclass(java.lang.String) -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.u.b.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.w.b.a.D:
     1:1:void <init>():898:898 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):898:898 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.u.b.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.w.b.a.A:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):904:904 -> <init>
     1:1:java.lang.String getName():904:904 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.u.b.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.w.b.a.B:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):919:919 -> <init>
     1:1:java.lang.String getName():919:919 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.u.b.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.w.b.a.C:
     int id -> a
     1:1:void <init>(int):911:911 -> <init>
     1:1:int getId():911:911 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.u.b.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.w.b.a.E:
     java.lang.Object value -> a
     1:1:void <init>(java.lang.Object):968:968 -> <init>
     1:1:java.lang.Object getValue():968:968 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.u.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.w.b.a.F:
     java.util.List valueParameters -> b
     java.util.List extensions -> d
     java.util.List versionRequirements -> c
@@ -43726,8 +43943,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():266:266 -> b
     1:1:int getFlags():248:248 -> c
     1:1:java.util.List getValueParameters():252:252 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.u.b.a.G:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.u.b.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.w.b.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.w.b.a.H:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):210:210 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):210:210 -> <init>
@@ -43735,26 +43952,26 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String) -> a
     1:1:void visitEnd():238:238 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.u.b.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.w.b.a.I:
     java.util.List effects -> b
     1:5:void <init>():758:762 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):765:765 -> a
     2:204:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:975 -> a
     205:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:774 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.u.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.w.b.a.J:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):663:663 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):663:663 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind) -> a
     1:1:void visitEnd():678:678 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.u.b.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.w.b.a.K:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor):11:11 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor getDelegate():11:11 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String) -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.u.b.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.w.b.a.L:
     java.util.List constructorArguments -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression conclusion -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType type -> d
@@ -43766,7 +43983,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():804:804 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():790:790 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():789:789 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.u.b.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.w.b.a.M:
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue constantValue -> d
@@ -43782,7 +43999,7 @@
     97:186:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):888:977 -> a
     187:188:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):889:890 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():877:877 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.u.b.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.w.b.a.N:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):722:722 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):722:722 -> <init>
@@ -43792,26 +44009,26 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int) -> a
     1:1:void visitEnd():769:769 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.u.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.w.b.a.O:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind EXACTLY_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_MOST_ONCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> c
     1:1:void <init>(java.lang.String,int):812:812 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.u.b.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.w.b.a.P:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType CALLS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_NOT_NULL -> c
     1:1:void <init>(java.lang.String,int):800:800 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.u.b.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.w.b.a.Q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):691:691 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):691:691 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument() -> b
     1:1:void visitEnd():710:710 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.u.b.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.w.b.a.S:
     com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):31:31 -> <init>
     1:1:boolean equals(java.lang.Object):33:33 -> equals
@@ -43824,15 +44041,15 @@
     31:31:java.lang.String toString():39:39 -> toString
     32:32:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):28:28 -> toString
     32:32:java.lang.String toString():39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.u.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.w.b.a.T:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.u.b.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.w.b.a.U:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):947:947 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():947:947 -> a
     1:1:java.lang.String getTypeFlexibilityId():947:947 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.u.b.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.w.b.a.V:
     java.util.List typeParameters -> b
     java.util.List versionRequirements -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType receiverParameterType -> c
@@ -43868,8 +44085,8 @@
     1:1:java.lang.String getName():292:292 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReceiverParameterType():302:302 -> f
     1:1:java.util.List getValueParameters():307:307 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.u.b.a.W:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.u.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.w.b.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.w.b.a.X:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):248:248 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):248:248 -> <init>
@@ -43881,7 +44098,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int) -> b
     1:1:void visitEnd():310:310 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.u.b.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.w.b.a.Y:
     java.util.List functions -> b
     java.util.List extensions -> e
     java.util.List typeAliases -> d
@@ -43921,15 +44138,15 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
     1:1:java.util.List getFunctions():179:179 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.u.b.a.Z:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.u.b.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.w.b.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.w.b.a.a0:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):162:162 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):162:162 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor getDelegate():164:164 -> b
     1:1:void visitEnd():178 -> b
     2:2:void visitEnd():178:178 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.u.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.w.b.a.b0:
     java.util.List typeParameters -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> d
     java.lang.String name -> i
@@ -43963,8 +44180,8 @@
     1:1:int getGetterFlags():378:378 -> d
     1:1:java.lang.String getName():377:377 -> e
     1:1:int getSetterFlags():379:379 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.u.b.a.c0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.u.b.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.w.b.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.w.b.a.d0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):320:320 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):320:320 -> <init>
@@ -43975,7 +44192,7 @@
     1:1:void visitEnd():376:376 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int) -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.u.b.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.w.b.a.e0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
     int flags -> h
     java.util.List arguments -> c
@@ -44010,7 +44227,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):661:661 -> b
     1:1:int getFlags():594:594 -> c
     2:2:void visitTypeParameter(int):647:647 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.u.b.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.w.b.a.f0:
     java.util.List typeParameters -> b
     java.lang.String name -> h
     java.util.List versionRequirements -> f
@@ -44032,7 +44249,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():493:493 -> b
     1:1:int getFlags():450:450 -> c
     1:1:java.lang.String getName():451:451 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.u.b.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.w.b.a.g0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):386:386 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):386:386 -> <init>
@@ -44042,8 +44259,8 @@
     1:1:void visitEnd():435:435 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int) -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.u.b.a.h0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.u.b.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.w.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.w.b.a.i0:
     java.util.List upperBounds -> b
     java.util.List extensions -> c
     int id -> f
@@ -44067,15 +44284,15 @@
     1:1:int getId():560:560 -> c
     1:1:java.lang.String getName():559:559 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():561:561 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.u.b.a.j0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.u.b.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.w.b.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.w.b.a.k0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):475:475 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):475:475 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int) -> a
     1:1:void visitEnd():496:496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.u.b.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.w.b.a.l0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection STAR -> c
@@ -44083,7 +44300,7 @@
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):929:929 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance component1() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType component2() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.u.b.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.w.b.a.m0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):511:511 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):511:511 -> <init>
@@ -44097,7 +44314,7 @@
     1:1:void visitStarProjection():555:555 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):585:585 -> b
     1:1:void visitTypeParameter(int):537:537 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.u.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.w.b.a.n0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType varargElementType -> c
     int flags -> d
@@ -44110,19 +44327,19 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):534:534 -> b
     1:1:java.lang.String getName():518:518 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():523:523 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.u.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.w.b.a.o0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):445:445 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):445:445 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int) -> a
     1:1:void visitEnd():466:466 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int) -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.u.b.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.w.b.a.p0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> c
     1:1:void <init>(java.lang.String,int):777:777 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.u.b.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.w.b.a.q0:
     int minor -> b
     int patch -> c
     int major -> a
@@ -44131,7 +44348,7 @@
     1:1:int getMinor():956:956 -> b
     1:1:int getPatch():956:956 -> c
     1:1:java.lang.String toString():957:957 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.u.b.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.w.b.a.r0:
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind kind -> b
@@ -44143,26 +44360,26 @@
     6:8:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:748 -> a
     9:9:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):747:747 -> a
     10:10:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:746 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.u.b.a.s0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.w.b.a.s0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):821:821 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.u.b.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.w.b.a.t0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind LANGUAGE_VERSION -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):830:830 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.u.b.a.u0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.w.b.a.u0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):622:622 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):622:622 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String) -> a
     void visitVersion(int,int,int) -> a
     1:1:void visitEnd():651:651 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.u.b.a.v0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.w.b.a.v0.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):396:398 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):408:408 -> a
@@ -44200,55 +44417,55 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():398:398 -> d
     2:2:void visitSealedSubclass(java.lang.String):440:440 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():397:397 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.u.b.a.v0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.w.b.a.v0.a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:416:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):0:414 -> a
     2:416:java.lang.Object invoke(java.lang.Object):396 -> a
     417:417:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.w.b.a.v0.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:450:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:448 -> a
     2:450:java.lang.Object invoke(java.lang.Object):396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.u.b.a.v0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.w.b.a.v0.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:419:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:417 -> a
     2:419:java.lang.Object invoke(java.lang.Object):396 -> a
     420:420:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.u.b.a.v0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.w.b.a.v0.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:422:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:420 -> a
     2:422:java.lang.Object invoke(java.lang.Object):396 -> a
     423:423:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.u.b.a.v0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.w.b.a.v0.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:413:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:411 -> a
     2:413:java.lang.Object invoke(java.lang.Object):396 -> a
     414:414:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.u.b.a.v0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.w.b.a.v0.f:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:425:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:423 -> a
     2:425:java.lang.Object invoke(java.lang.Object):396 -> a
     426:426:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.w.b.a.v0.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:410:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:408 -> a
     2:410:java.lang.Object invoke(java.lang.Object):396 -> a
     411:411:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.w.b.a.v0.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:2:void invoke(int):444:444 -> a
     2:2:java.lang.Object invoke(java.lang.Object):396 -> a
     3:3:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.u.b.a.v0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.w.b.a.v0.n:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):458:460 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):463:463 -> a
@@ -44264,31 +44481,31 @@
     3:4:void visitEnd():477:478 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():460:460 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():459:459 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.w.b.a.v0.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:475:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:473 -> a
     2:475:java.lang.Object invoke(java.lang.Object):458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.u.b.a.v0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.w.b.a.v0.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:465:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:463 -> a
     2:465:java.lang.Object invoke(java.lang.Object):458 -> a
     466:466:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.u.b.a.v0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.w.b.a.v0.l:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:468:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:466 -> a
     2:468:java.lang.Object invoke(java.lang.Object):458 -> a
     469:469:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.u.b.a.v0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.w.b.a.v0.m:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:471:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:469 -> a
     2:471:java.lang.Object invoke(java.lang.Object):458 -> a
     472:472:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.u.b.a.v0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.w.b.a.v0.o:
     java.util.List extensions -> a
     java.util.Map typeParameterNameToId -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> d
@@ -44304,7 +44521,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():16:16 -> c
     2:2:java.lang.Integer getTypeParameterId(int):30:30 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():17:17 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.u.b.a.v0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.w.b.a.v0.p:
     1:1:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt.isLocal(java.lang.String):0:0 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):109 -> a
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):195:195 -> a
@@ -44643,7 +44860,7 @@
     4837:4837:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):426:426 -> a
     4838:4838:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getDefaultPropertyAccessorFlags(int):432:432 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.u.b.a.v0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.w.b.a.v0.q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):15:16 -> <init>
@@ -44651,7 +44868,7 @@
     2:2:int get(java.lang.String):19:19 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable getVersionRequirements():16:16 -> b
     2:2:int getClassName(java.lang.String):22:22 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.u.b.a.v0.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.w.b.a.v0.u:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder t -> b
     int $flags -> d
@@ -44668,25 +44885,25 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():129 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():123:123 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.w.b.a.v0.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:135:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:133 -> a
     2:135:java.lang.Object invoke(java.lang.Object):122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.u.b.a.v0.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.w.b.a.v0.s:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:128:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:126 -> a
     2:128:java.lang.Object invoke(java.lang.Object):122 -> a
     129:129:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.w.b.a.v0.t:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:2:void invoke(int):129:129 -> a
     2:2:java.lang.Object invoke(java.lang.Object):122 -> a
     3:3:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.u.b.a.v0.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.w.b.a.v0.w:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -44697,13 +44914,13 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):324 -> a
     3:3:void visitEnd():327:327 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder getT():321:321 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.u.b.a.v0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.w.b.a.v0.v:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):320:320 -> a
     2:326:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):0:324 -> a
     2:326:java.lang.Object invoke(java.lang.Object):320 -> a
     327:327:java.lang.Object invoke(java.lang.Object):320:320 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.u.b.a.v0.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.w.b.a.v0.z:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -44724,19 +44941,19 @@
     15:15:void visitEnd():352:352 -> c
     16:21:void visitEnd():351:356 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder getT():335:335 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.u.b.a.v0.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.w.b.a.v0.x:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
     2:343:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:341 -> a
     2:343:java.lang.Object invoke(java.lang.Object):334 -> a
     344:344:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.u.b.a.v0.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.w.b.a.v0.y:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
     2:340:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:338 -> a
     2:340:java.lang.Object invoke(java.lang.Object):334 -> a
     341:341:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.u.b.a.v0.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.w.b.a.v0.D:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -44757,25 +44974,25 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():389 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder getT():362:362 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.u.b.a.v0.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.w.b.a.v0.A:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:388:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:386 -> a
     2:388:java.lang.Object invoke(java.lang.Object):361 -> a
     389:389:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.u.b.a.v0.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.w.b.a.v0.B:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:385:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:383 -> a
     2:385:java.lang.Object invoke(java.lang.Object):361 -> a
     386:386:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.u.b.a.v0.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.w.b.a.v0.C:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:391:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:389 -> a
     2:391:java.lang.Object invoke(java.lang.Object):361 -> a
     392:392:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.u.b.a.v0.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.w.b.a.v0.L:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
@@ -44809,7 +45026,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():161 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():146:146 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.u.b.a.v0.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.w.b.a.v0.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:166:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):0:164 -> a
@@ -44827,43 +45044,43 @@
     172:172:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23586:23586 -> a
     172:172:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):164 -> a
     172:172:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.w.b.a.v0.F:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:170:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:168 -> a
     2:170:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.u.b.a.v0.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.w.b.a.v0.G:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:154:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:152 -> a
     2:154:java.lang.Object invoke(java.lang.Object):145 -> a
     155:155:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.u.b.a.v0.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.w.b.a.v0.H:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:160:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:158 -> a
     2:160:java.lang.Object invoke(java.lang.Object):145 -> a
     161:161:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.w.b.a.v0.I:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:151:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:149 -> a
     2:151:java.lang.Object invoke(java.lang.Object):145 -> a
     152:152:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.u.b.a.v0.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.w.b.a.v0.J:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:157:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:155 -> a
     2:157:java.lang.Object invoke(java.lang.Object):145 -> a
     158:158:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.w.b.a.v0.K:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:2:void invoke(int):161:161 -> a
     2:2:java.lang.Object invoke(java.lang.Object):145 -> a
     3:3:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.u.b.a.v0.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.w.b.a.v0.T:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
     int $setterFlags -> g
@@ -44895,43 +45112,43 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():198 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder getT():183:183 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.w.b.a.v0.M:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:204:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:202 -> a
     2:204:java.lang.Object invoke(java.lang.Object):182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.u.b.a.v0.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.w.b.a.v0.N:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:191:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:189 -> a
     2:191:java.lang.Object invoke(java.lang.Object):182 -> a
     192:192:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.u.b.a.v0.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.w.b.a.v0.O:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:197:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:195 -> a
     2:197:java.lang.Object invoke(java.lang.Object):182 -> a
     198:198:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.u.b.a.v0.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.w.b.a.v0.P:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:194:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:192 -> a
     2:194:java.lang.Object invoke(java.lang.Object):182 -> a
     195:195:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.w.b.a.v0.Q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:188:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:186 -> a
     2:188:java.lang.Object invoke(java.lang.Object):182 -> a
     189:189:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.w.b.a.v0.S:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:2:void invoke(int):198:198 -> a
     2:2:java.lang.Object invoke(java.lang.Object):182 -> a
     3:3:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.u.b.a.v0.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.w.b.a.v0.Z:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder t -> b
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
     int $flags -> d
@@ -44961,13 +45178,13 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):94 -> b
     1:1:void visitTypeParameter(int):87:87 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.u.b.a.v0.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.w.b.a.v0.U:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:93:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:91 -> a
     2:93:java.lang.Object invoke(java.lang.Object):57 -> a
     94:94:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.u.b.a.v0.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.w.b.a.v0.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
@@ -44976,26 +45193,26 @@
     85:85:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):76:76 -> a
     85:85:java.lang.Object invoke(java.lang.Object):57 -> a
     86:86:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.w.b.a.v0.W:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:108:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:106 -> a
     2:108:java.lang.Object invoke(java.lang.Object):57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.u.b.a.v0.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.w.b.a.v0.X:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     java.lang.String $typeFlexibilityId -> b
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:103:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:101 -> a
     2:103:java.lang.Object invoke(java.lang.Object):57 -> a
     104:104:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.u.b.a.v0.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.w.b.a.v0.Y:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:96:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:94 -> a
     2:96:java.lang.Object invoke(java.lang.Object):57 -> a
     97:97:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.u.b.a.v0.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.w.b.a.v0.e0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
@@ -45021,31 +45238,31 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():258 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder getT():242:242 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.u.b.a.v0.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.w.b.a.v0.a0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:253:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:251 -> a
     2:253:java.lang.Object invoke(java.lang.Object):241 -> a
     254:254:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.w.b.a.v0.b0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:247:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:245 -> a
     2:247:java.lang.Object invoke(java.lang.Object):241 -> a
     248:248:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.u.b.a.v0.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.w.b.a.v0.c0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:250:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:248 -> a
     2:250:java.lang.Object invoke(java.lang.Object):241 -> a
     251:251:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.w.b.a.v0.d0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:2:void invoke(int):258:258 -> a
     2:2:java.lang.Object invoke(java.lang.Object):241 -> a
     3:3:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.w.b.a.v0.h0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> h
@@ -45061,19 +45278,19 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):33 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):36:36 -> a
     5:16:void visitEnd():41:52 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.w.b.a.v0.f0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
     2:39:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:37 -> a
     2:39:java.lang.Object invoke(java.lang.Object):29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.u.b.a.v0.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.w.b.a.v0.g0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
     2:35:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:33 -> a
     2:35:java.lang.Object invoke(java.lang.Object):29 -> a
     36:36:java.lang.Object invoke(java.lang.Object):29:29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.u.b.a.v0.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.w.b.a.v0.k0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
@@ -45090,19 +45307,19 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):227 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.u.b.a.v0.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.w.b.a.v0.i0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
     2:226:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:224 -> a
     2:226:java.lang.Object invoke(java.lang.Object):220 -> a
     227:227:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.u.b.a.v0.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.w.b.a.v0.j0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
     2:229:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:227 -> a
     2:229:java.lang.Object invoke(java.lang.Object):220 -> a
     230:230:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.w.b.a.v0.n0:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -45125,7 +45342,7 @@
     36:39:void visitEnd():312:315 -> a
     40:40:void visitEnd():313:313 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder getT():272:272 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.u.b.a.v0.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.w.b.a.v0.l0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
     2:2:void invoke(int):306:306 -> a
@@ -45133,7 +45350,7 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void invoke(int):306:306 -> a
     4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.u.b.a.v0.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.w.b.a.v0.m0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
     2:2:void invoke(int):307:307 -> a
@@ -45141,29 +45358,29 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void invoke(int):307:307 -> a
     4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.u.b.a.v0.o0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.u.b.a.v0.o0.b:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.u.b.a.v0.o0.c:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.u.b.a.v0.o0.d:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.u.b.a.v0.o0.e:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.u.b.a.v0.o0.f:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.u.b.a.v0.o0.g:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.u.b.a.v0.o0.h:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.u.b.a.v0.o0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.w.b.a.v0.o0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.w.b.a.v0.o0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.w.b.a.v0.o0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.w.b.a.v0.o0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.w.b.a.v0.o0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.w.b.a.v0.o0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.w.b.a.v0.o0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.w.b.a.v0.o0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.w.b.a.v0.o0.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion Companion -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.u.b.a.v0.o0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.w.b.a.v0.o0.j:
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion $$INSTANCE -> c
     1:2:void <clinit>():61:62 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     java.util.List getINSTANCES() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.u.b.a.v0.o0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.w.b.a.v0.o0.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> a
     1:2:java.util.List invoke():63:64 -> a
     1:2:java.lang.Object invoke():61 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.u.b.a.w0.a.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.u.b.a.w0.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.w.b.a.w0.a.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.w.b.a.w0.a.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List argument_ -> d
@@ -45225,11 +45442,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getDefaultInstance():1888:1888 -> j
     1:2:void initFields():4210:4211 -> k
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder():4324:4324 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.u.b.a.w0.a.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.w.b.a.w0.a.b:
     1:1:void <init>():1957:1957 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1962:1962 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1957 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.u.b.a.w0.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.w.b.a.w0.a.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> g
@@ -45287,11 +45504,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getDefaultInstance():2009:2009 -> k
     1:2:void initFields():3823:3824 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3939:3939 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.u.b.a.w0.a.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.w.b.a.w0.a.c:
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2080 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.u.b.a.w0.a.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.w.b.a.w0.a.d:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -45345,7 +45562,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:4003 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder create():3963:3963 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder access$3600():3949 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.u.b.a.w0.a.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.w.b.a.w0.a.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> p
     int memoizedSerializedSize -> o
     int arrayDimensionCount_ -> l
@@ -45464,11 +45681,11 @@
     1:1:boolean hasFloatValue():2617:2617 -> x
     1:1:boolean hasIntValue():2602:2602 -> y
     1:1:boolean hasStringValue():2647:2647 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.u.b.a.w0.a.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.w.b.a.w0.a.e:
     1:1:void <init>():2399:2399 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2404:2404 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2399 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.u.b.a.w0.a.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.w.b.a.w0.a.f:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -45554,7 +45771,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder create():3019:3019 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder access$2100():3005 -> f
     1:3:void ensureArrayElementIsMutable():3530:3532 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.u.b.a.w0.a.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.w.b.a.w0.a.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type CHAR -> c
@@ -45587,7 +45804,7 @@
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> b
     12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> b
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.u.b.a.w0.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.w.b.a.w0.a.j:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -45636,7 +45853,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
     1:3:void ensureArgumentIsMutable():4481:4483 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.u.b.a.w0.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.w.b.a.w0.a.o:
     java.util.List sealedSubclassFqName_ -> r
     int nestedClassNameMemoizedSerializedSize -> l
     java.util.List typeAlias_ -> p
@@ -45824,11 +46041,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9297:9297 -> x
     1:1:java.util.List getVersionRequirementList():9311:9311 -> y
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9346:9346 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.u.b.a.w0.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.w.b.a.w0.a.l:
     1:1:void <init>():8778:8778 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8783:8783 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8778 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.u.b.a.w0.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.w.b.a.w0.a.m:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -45990,7 +46207,7 @@
     1:3:void ensureTypeAliasIsMutable():10952:10954 -> o
     1:3:void ensureTypeParameterIsMutable():10195:10197 -> p
     1:3:void ensureVersionRequirementIsMutable():11327:11329 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.u.b.a.w0.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.w.b.a.w0.a.n:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind ENUM_CLASS -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> c
@@ -46005,7 +46222,7 @@
     1:2:void <init>(java.lang.String,int,int,int):8894:8895 -> <init>
     1:1:int getNumber():8865:8865 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8795:8795 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.u.b.a.w0.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.w.b.a.w0.a.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List versionRequirement_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor defaultInstance -> i
@@ -46068,11 +46285,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13381:13381 -> o
     1:3:void initFields():13586:13588 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13718:13718 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.u.b.a.w0.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.w.b.a.w0.a.p:
     1:1:void <init>():13474:13474 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13479:13479 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13474 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.u.b.a.w0.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.w.b.a.w0.a.q:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -46116,7 +46333,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12500():13728 -> g
     1:3:void ensureValueParameterIsMutable():13916:13918 -> h
     1:3:void ensureVersionRequirementIsMutable():14040:14042 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.u.b.a.w0.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.w.b.a.w0.a.u:
     java.util.List effect_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> f
@@ -46168,11 +46385,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getDefaultInstance():23325:23325 -> h
     1:1:void initFields():23439:23439 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():23541:23541 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.u.b.a.w0.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.w.b.a.w0.a.s:
     1:1:void <init>():23389:23389 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23394:23394 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23389 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.u.b.a.w0.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.w.b.a.w0.a.t:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -46216,7 +46433,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder create():23565:23565 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
     1:3:void ensureEffectIsMutable():23651:23653 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.u.b.a.w0.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.w.b.a.w0.a.z:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List effectConstructorArgument_ -> d
@@ -46283,11 +46500,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getDefaultInstance():23855:23855 -> n
     1:4:void initFields():24226:24229 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24358:24358 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.u.b.a.w0.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.w.b.a.w0.a.v:
     1:1:void <init>():23956:23956 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23961:23961 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23956 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.u.b.a.w0.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.w.b.a.w0.a.w:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     java.util.List effectConstructorArgument_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> e
@@ -46348,7 +46565,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder create():24382:24382 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
     1:3:void ensureEffectConstructorArgumentIsMutable():24538:24540 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.u.b.a.w0.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.w.b.a.w0.a.x:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] $VALUES -> e
@@ -46361,7 +46578,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24043:24043 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24042:24042 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24041:24041 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.u.b.a.w0.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.w.b.a.w0.a.y:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] $VALUES -> e
@@ -46374,7 +46591,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24108:24108 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24107:24107 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24106:24106 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.u.b.a.w0.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.w.b.a.w0.a.C:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> g
@@ -46418,11 +46635,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20471:20471 -> m
     1:1:void initFields():20560:20560 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20665:20665 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.u.b.a.w0.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.w.b.a.w0.a.A:
     1:1:void <init>():20529:20529 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20534:20534 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20529 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.u.b.a.w0.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.w.b.a.w0.a.B:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -46456,7 +46673,7 @@
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder create():20688:20688 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20675 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.u.b.a.w0.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.w.b.a.w0.a.G:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int memoizedSerializedSize -> k
     int isInstanceTypeId_ -> g
@@ -46546,11 +46763,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24960:24960 -> s
     1:7:void initFields():25391:25397 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25553:25553 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.u.b.a.w0.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.w.b.a.w0.a.D:
     1:1:void <init>():25075:25075 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25080:25080 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25075 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.u.b.a.w0.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.w.b.a.w0.a.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> f
     int isInstanceTypeId_ -> g
@@ -46628,7 +46845,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$23700():25568 -> f
     1:3:void ensureAndArgumentIsMutable():26005:26007 -> g
     1:3:void ensureOrArgumentIsMutable():26202:26204 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.u.b.a.w0.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.w.b.a.w0.a.F:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue TRUE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> e
@@ -46641,7 +46858,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25128:25128 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25127:25127 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25126:25126 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.u.b.a.w0.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.w.b.a.w0.a.J:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> r
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int receiverTypeId_ -> k
@@ -46769,11 +46986,11 @@
     1:1:boolean hasFlags():14538:14538 -> x
     1:1:boolean hasName():14582:14582 -> y
     1:1:boolean hasOldFlags():14567:14567 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.u.b.a.w0.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.w.b.a.w0.a.H:
     1:1:void <init>():14503:14503 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14508:14508 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14503 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.u.b.a.w0.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.w.b.a.w0.a.I:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -46917,7 +47134,7 @@
     1:3:void ensureTypeParameterIsMutable():15533:15535 -> h
     1:3:void ensureValueParameterIsMutable():15750:15752 -> i
     1:3:void ensureVersionRequirementIsMutable():15934:15936 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.u.b.a.w0.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.w.b.a.w0.a.K:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind FAKE_OVERRIDE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> d
@@ -46929,7 +47146,7 @@
     1:2:void <init>(java.lang.String,int,int,int):268:269 -> <init>
     1:1:int getNumber():242:242 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] values():196:196 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.u.b.a.w0.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.w.b.a.w0.a.L:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality ABSTRACT -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality FINAL -> b
@@ -46941,7 +47158,7 @@
     1:2:void <init>(java.lang.String,int,int,int):86:87 -> <init>
     1:1:int getNumber():60:60 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality[] values():14:14 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.u.b.a.w0.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.w.b.a.w0.a.O:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package defaultInstance -> k
@@ -47023,11 +47240,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstance():11572:11572 -> r
     1:5:void initFields():11835:11839 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():11996:11996 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.u.b.a.w0.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.w.b.a.w0.a.M:
     1:1:void <init>():11684:11684 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11689:11689 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11684 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.u.b.a.w0.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.w.b.a.w0.a.N:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -47109,7 +47326,7 @@
     1:3:void ensureFunctionIsMutable():12182:12184 -> h
     1:3:void ensurePropertyIsMutable():12307:12309 -> i
     1:3:void ensureTypeAliasIsMutable():12432:12434 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.u.b.a.w0.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.w.b.a.w0.a.S:
     int setterFlags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -47227,11 +47444,11 @@
     1:1:boolean hasGetterFlags():16686:16686 -> x
     1:1:boolean hasName():16549:16549 -> y
     1:1:boolean hasOldFlags():16534:16534 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.u.b.a.w0.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.w.b.a.w0.a.P:
     1:1:void <init>():16466:16466 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16471:16471 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16466 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.u.b.a.w0.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.w.b.a.w0.a.Q:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -47359,7 +47576,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15000():16993 -> g
     1:3:void ensureTypeParameterIsMutable():17480:17482 -> h
     1:3:void ensureVersionRequirementIsMutable():17868:17870 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.u.b.a.w0.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.w.b.a.w0.a.Z:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -47491,11 +47708,11 @@
     1:1:int getTypeParameterName():5830:5830 -> x
     1:1:boolean hasAbbreviatedType():5902:5902 -> y
     1:1:boolean hasAbbreviatedTypeId():5917:5917 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.u.b.a.w0.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.w.b.a.w0.a.T:
     1:1:void <init>():4972:4972 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4977:4977 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4972 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.u.b.a.w0.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.w.b.a.w0.a.X:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
@@ -47552,11 +47769,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getDefaultInstance():5041:5041 -> m
     1:3:void initFields():5267:5269 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5385:5385 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.u.b.a.w0.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.w.b.a.w0.a.U:
     1:1:void <init>():5124:5124 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5129:5129 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5124 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.u.b.a.w0.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.w.b.a.w0.a.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> d
     int typeId_ -> e
@@ -47610,7 +47827,7 @@
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.u.b.a.w0.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.w.b.a.w0.a.W:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection OUT -> c
@@ -47625,7 +47842,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5184:5184 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5183:5183 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.u.b.a.w0.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.w.b.a.w0.a.Y:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -47767,7 +47984,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder create():6206:6206 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder access$5700():6193 -> g
     1:3:void ensureArgumentIsMutable():6434:6436 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.u.b.a.w0.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.w.b.a.w0.a.c0:
     int memoizedSerializedSize -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
@@ -47872,11 +48089,11 @@
     1:1:boolean hasUnderlyingType():19268:19268 -> x
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> y
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():19027:19027 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.u.b.a.w0.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.w.b.a.w0.a.a0:
     1:1:void <init>():19172:19172 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19177:19177 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19172 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.u.b.a.w0.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.w.b.a.w0.a.b0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> j
     int expandedTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> h
@@ -47979,7 +48196,7 @@
     1:3:void ensureAnnotationIsMutable():20213:20215 -> h
     1:3:void ensureTypeParameterIsMutable():19904:19906 -> i
     1:3:void ensureVersionRequirementIsMutable():20337:20339 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.u.b.a.w0.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.w.b.a.w0.a.g0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     int upperBoundIdMemoizedSerializedSize -> j
@@ -48068,11 +48285,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstance():7264:7264 -> u
     1:6:void initFields():7578:7583 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7751:7751 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.u.b.a.w0.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.w.b.a.w0.a.d0:
     1:1:void <init>():7379:7379 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7384:7384 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7379 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.u.b.a.w0.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.w.b.a.w0.a.e0:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -48132,7 +48349,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder create():7774:7774 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7761 -> g
     1:3:void ensureUpperBoundIsMutable():8059:8061 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.u.b.a.w0.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.w.b.a.w0.a.f0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance OUT -> c
@@ -48145,7 +48362,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7432:7432 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7431:7431 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7430:7430 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.u.b.a.w0.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.w.b.a.w0.a.j0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List type_ -> c
@@ -48205,11 +48422,11 @@
     1:1:boolean hasFirstNullable():12868:12868 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getDefaultInstance():12738:12738 -> j
     1:2:void initFields():12883:12884 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.u.b.a.w0.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.w.b.a.w0.a.h0:
     1:1:void <init>():12807:12807 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12812:12812 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12807 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.u.b.a.w0.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.w.b.a.w0.a.i0:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -48250,7 +48467,7 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder create():13017:13017 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13003 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.u.b.a.w0.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.w.b.a.w0.a.m0:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -48331,11 +48548,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():18061:18061 -> w
     1:6:void initFields():18280:18285 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18441:18441 -> y
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.u.b.a.w0.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.w.b.a.w0.a.k0:
     1:1:void <init>():18160:18160 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18165:18165 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18160 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.u.b.a.w0.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.w.b.a.w0.a.l0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
     int varargElementTypeId_ -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> g
@@ -48419,7 +48636,7 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder create():18464:18464 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$16700():18451 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.u.b.a.w0.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.w.b.a.w0.a.r0:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -48486,11 +48703,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement getDefaultInstance():20937:20937 -> s
     1:6:void initFields():21326:21331 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21462:21462 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.u.b.a.w0.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.w.b.a.w0.a.n0:
     1:1:void <init>():21034:21034 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21039:21039 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21034 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.u.b.a.w0.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.w.b.a.w0.a.o0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -48553,7 +48770,7 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder create():21486:21486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21472 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.u.b.a.w0.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.w.b.a.w0.a.p0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> c
@@ -48566,7 +48783,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21087:21087 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21086:21086 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21085:21085 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.u.b.a.w0.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.w.b.a.w0.a.q0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> d
@@ -48579,7 +48796,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21152:21152 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21151:21151 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21150:21150 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.u.b.a.w0.a.u0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.w.b.a.w0.a.u0:
     java.util.List requirement_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -48627,11 +48844,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getDefaultInstance():21957:21957 -> i
     1:1:void initFields():22071:22071 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():22167:22167 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.u.b.a.w0.a.s0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.w.b.a.w0.a.s0:
     1:1:void <init>():22021:22021 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22026:22026 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22021 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.u.b.a.w0.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.w.b.a.w0.a.t0:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -48671,7 +48888,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder create():22191:22191 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
     1:3:void ensureRequirementIsMutable():22271:22273 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.u.b.a.w0.a.v0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.w.b.a.w0.a.v0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PUBLIC -> e
@@ -48685,7 +48902,7 @@
     1:2:void <init>(java.lang.String,int,int,int):186:187 -> <init>
     1:1:int getNumber():158:158 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] values():96:96 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.u.b.a.w0.a.w0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.w.b.a.w0.a.w0.a:
     java.util.List rest -> d
     int[] numbers -> e
     int minor -> b
@@ -48702,7 +48919,7 @@
     1:1:java.lang.String toString():52 -> toString
     2:6:java.lang.String toString():80:84 -> toString
     7:7:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.u.b.a.w0.a.w0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.w.b.a.w0.a.w0.f:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField MEMBER_KIND -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_SUSPEND -> p
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_GETTER -> r
@@ -48738,8 +48955,8 @@
     void $$$reportNull$$$0(int) -> a
     1:1:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189:189 -> a
     2:2:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.u.b.a.w0.a.w0.b:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.u.b.a.w0.a.w0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.w.b.a.w0.a.w0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.w.b.a.w0.a.w0.c:
     1:1:void <init>(int):259:259 -> <init>
     1:1:java.lang.Object get(int):256:256 -> a
     2:2:int toFlags(java.lang.Object):256:256 -> a
@@ -48747,7 +48964,7 @@
     4:4:void $$$reportNull$$$0(int):0:0 -> a
     4:4:java.lang.Boolean get(int):265 -> a
     5:5:int toFlags(java.lang.Boolean):270:270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.u.b.a.w0.a.w0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.w.b.a.w0.a.w0.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[] values -> c
     1:2:void <init>(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):280:281 -> <init>
     1:1:int toFlags(java.lang.Object):276:276 -> a
@@ -48758,7 +48975,7 @@
     9:9:int bitWidth(java.lang.Object[]):0 -> a
     10:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite get(int):296:300 -> a
     10:14:java.lang.Object get(int):276 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.u.b.a.w0.a.w0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.w.b.a.w0.a.w0.e:
     int bitWidth -> b
     int offset -> a
     1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):224:224 -> <init>
@@ -48768,15 +48985,15 @@
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):226:227 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():235:235 -> a
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:240 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.u.b.a.w0.a.w0.g:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.u.b.a.w0.a.w0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.w.b.a.w0.a.w0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.w.b.a.w0.a.w0.h:
     java.util.List types -> a
     1:20:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):21:40 -> <init>
     21:33:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):28:40 -> <init>
     34:34:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):31:31 -> <init>
     35:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type get(int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.u.b.a.w0.a.w0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.w.b.a.w0.a.w0.l:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version version -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> b
     java.lang.Integer errorCode -> d
@@ -48790,10 +49007,10 @@
     1:1:java.lang.String getMessage():29:29 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version getVersion():25:25 -> e
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.u.b.a.w0.a.w0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.w.b.a.w0.a.w0.i:
     1:1:void <init>():83:83 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):83:83 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.u.b.a.w0.a.w0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.w.b.a.w0.a.w0.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion Companion -> e
     int minor -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version INFINITY -> d
@@ -48808,10 +49025,10 @@
     int component3() -> c
     1:1:java.lang.String asString():33:33 -> toString
     1:1:java.lang.String toString():50 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.u.b.a.w0.a.w0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.w.b.a.w0.a.w0.j:
     1:1:void <init>():52:52 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):52:52 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.u.b.a.w0.a.w0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.w.b.a.w0.a.w0.n:
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable EMPTY -> b
@@ -48835,7 +49052,7 @@
     166:166:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getOrNull(java.util.List,int):0 -> a
     166:166:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
     167:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.u.b.a.w0.a.w0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.w.b.a.w0.a.w0.m:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
@@ -48843,7 +49060,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
     3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:19 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.u.b.a.w0.a.x0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.w.b.a.w0.a.x0.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension constructorSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension propertySignature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension flags -> e
@@ -48858,8 +49075,8 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension classLocalVariable -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
     1:212:void <clinit>():3800:4011 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.u.b.a.w0.a.x0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.u.b.a.w0.a.x0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.w.b.a.w0.a.x0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.w.b.a.w0.a.x0.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> g
@@ -48913,11 +49130,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> k
     1:2:void initFields():2724:2725 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.u.b.a.w0.a.x0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.w.b.a.w0.a.x0.b:
     1:1:void <init>():2670:2670 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2675:2675 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2670 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.w.b.a.w0.a.x0.c:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -48956,7 +49173,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder create():2852:2852 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2838 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.u.b.a.w0.a.x0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.w.b.a.w0.a.x0.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -49010,11 +49227,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> k
     1:2:void initFields():2262:2263 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.u.b.a.w0.a.x0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.w.b.a.w0.a.x0.e:
     1:1:void <init>():2208:2208 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2213:2213 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2208 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.w.b.a.w0.a.x0.f:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -49053,7 +49270,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder create():2390:2390 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2376 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.u.b.a.w0.a.x0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.w.b.a.w0.a.x0.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -49114,11 +49331,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature getDefaultInstance():3087:3087 -> o
     1:4:void initFields():3276:3279 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3396:3396 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.u.b.a.w0.a.x0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.w.b.a.w0.a.x0.h:
     1:1:void <init>():3192:3192 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3197:3197 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3192 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.w.b.a.w0.a.x0.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> d
@@ -49203,7 +49420,7 @@
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder create():3420:3420 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3406 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.u.b.a.w0.a.x0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.w.b.a.w0.a.x0.q:
     java.util.List record_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -49260,11 +49477,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getDefaultInstance():83:83 -> i
     1:2:void initFields():1633:1634 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1751:1751 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.u.b.a.w0.a.x0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.w.b.a.w0.a.x0.k:
     1:1:void <init>():171:171 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):176:176 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):171 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.w.b.a.w0.a.x0.l:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -49299,7 +49516,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1761 -> f
     1:3:void ensureLocalNameIsMutable():1996:1998 -> g
     1:3:void ensureRecordIsMutable():1872:1874 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.u.b.a.w0.a.x0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.w.b.a.w0.a.x0.p:
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int replaceCharMemoizedSerializedSize -> j
@@ -49408,11 +49625,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record getDefaultInstance():341:341 -> s
     1:6:void initFields():773:778 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder():937:937 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.u.b.a.w0.a.x0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.w.b.a.w0.a.x0.m:
     1:1:void <init>():470:470 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):475:475 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):470 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.w.b.a.w0.a.x0.n:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -49472,7 +49689,7 @@
     1:1:boolean hasPredefinedIndex():1152:1152 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder create():961:961 -> k
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder access$200():947 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.u.b.a.w0.a.x0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.w.b.a.w0.a.x0.o:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation NONE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> d
@@ -49485,7 +49702,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.u.b.a.w0.a.x0.s.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.w.b.a.w0.a.x0.s.a:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -49514,7 +49731,7 @@
     263:279:byte[] decode7to8(byte[]):247:263 -> a
     263:279:byte[] decodeBytes(java.lang.String[]):192 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.u.b.a.w0.a.x0.s.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.w.b.a.w0.a.x0.s.c:
     java.util.Map map -> a
     1:10:void <clinit>():20:29 -> <clinit>
     11:11:void <clinit>():21:21 -> <clinit>
@@ -49538,20 +49755,20 @@
     747:784:void <clinit>():32:69 -> <clinit>
     785:785:void <clinit>():20:20 -> <clinit>
     1:1:java.lang.String mapClass(java.lang.String):78:78 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.u.b.a.w0.a.x0.s.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.w.b.a.w0.a.x0.s.b:
     java.util.Map $this_apply -> a
     1:1:java.lang.Object invoke(java.lang.Object,java.lang.Object):15:15 -> a
     2:2:void invoke(java.lang.String,java.lang.String):40:40 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.u.b.a.w0.a.x0.s.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.w.b.a.w0.a.x0.s.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion INSTANCE -> f
     1:4:void <clinit>():19:22 -> <clinit>
     1:1:void <init>(int[]):14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.u.b.a.w0.a.x0.s.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.w.b.a.w0.a.x0.s.g:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
     java.lang.String asString() -> a
     1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.u.b.a.w0.a.x0.s.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.w.b.a.w0.a.x0.s.e:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):23:23 -> <init>
@@ -49580,7 +49797,7 @@
     3:3:java.lang.String getDesc():23:23 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.u.b.a.w0.a.x0.s.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.w.b.a.w0.a.x0.s.f:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):19:19 -> <init>
@@ -49609,7 +49826,7 @@
     3:3:java.lang.String getDesc():19:19 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.u.b.a.w0.a.x0.s.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.w.b.a.w0.a.x0.s.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
     1:1:void <clinit>():30:30 -> <clinit>
@@ -49620,7 +49837,7 @@
     22:37:void <clinit>():33 -> <clinit>
     1:1:void <init>(int[],boolean):14:14 -> <init>
     1:6:boolean isCompatible():20:25 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.u.b.a.w0.a.x0.s.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.w.b.a.w0.a.x0.s.j:
     java.util.List records -> b
     java.util.List PREDEFINED_STRINGS -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes types -> c
@@ -49640,10 +49857,10 @@
     2:2:boolean isLocalClassName(int):75:75 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> c
     1:1:java.util.Map access$getPREDEFINED_STRINGS_MAP$cp():13:13 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.u.b.a.w0.a.x0.s.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.w.b.a.w0.a.x0.s.i:
     1:1:void <init>():77:77 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):77:77 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.u.b.a.w0.a.x0.s.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.w.b.a.w0.a.x0.s.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil INSTANCE -> b
     1:2:void <clinit>():18:19 -> <clinit>
@@ -49704,7 +49921,7 @@
     45:45:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(byte[],java.lang.String[]):42:42 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.u.b.a.w0.a.x0.t.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.w.b.a.w0.a.x0.t.a:
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
     java.util.ArrayList strings -> a
@@ -49750,7 +49967,7 @@
     777:777:void serializeTo(java.io.OutputStream):98 -> a
     778:778:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1798:1798 -> a
     778:778:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.u.b.a.w0.a.y0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.w.b.a.w0.a.y0.b:
     java.util.HashMap interned -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner parent -> c
     int firstIndex -> a
@@ -49769,13 +49986,13 @@
     5992:5993:int intern(java.lang.Object):26:27 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:5:java.lang.Integer find(java.lang.Object):19:22 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.u.b.a.w0.a.y0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.w.b.a.w0.a.y0.a:
     java.util.HashMap receiver$0$inlined -> a
     1:220:int compare(java.lang.Object,java.lang.Object):102:321 -> compare
     221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):0 -> compare
     221:221:int compare(java.lang.Object,java.lang.Object):321 -> compare
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.u.b.a.w0.a.y0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.w.b.a.w0.a.y0.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.interner -> a
     1:6:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.<init>():23:28 -> <init>
     1:6:void <init>():56 -> <init>
@@ -49803,7 +50020,7 @@
     42:102:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():44:44 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.u.b.a.w0.a.y0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.w.b.a.w0.a.y0.d:
     byte[] bytes -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> c
     int hashCode -> b
@@ -49811,14 +50028,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder getBuilder():13:13 -> a
     1:1:boolean equals(java.lang.Object):20:20 -> equals
     1:1:int hashCode():18:18 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite -> com.android.tools.r8.u.b.a.w0.b.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite -> com.android.tools.r8.w.b.a.w0.b.c:
     1:1:void <init>():46:46 -> <init>
     void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream) -> a
     int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.getSerializedSize() -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.newBuilderForType() -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.toBuilder() -> e
     1:7:byte[] toByteArray():64:70 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder -> com.android.tools.r8.u.b.a.w0.b.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder -> com.android.tools.r8.w.b.a.w0.b.b:
     1:1:void <init>():118:118 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite) -> a
     1:1:void addAll(java.lang.Iterable,java.util.Collection):334:334 -> a
@@ -49827,14 +50044,14 @@
     5:11:void addAll(java.lang.Iterable,java.util.Collection):336:342 -> a
     12:12:void addAll(java.lang.Iterable,java.util.Collection):340:340 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder.build() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder$LimitedInputStream -> com.android.tools.r8.u.b.a.w0.b.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder$LimitedInputStream -> com.android.tools.r8.w.b.a.w0.b.a:
     int limit -> a
     1:2:void <init>(java.io.InputStream,int):245:246 -> <init>
     1:1:int available():251:251 -> available
     1:6:int read():256:261 -> read
     7:13:int read(byte[],int,int):269:275 -> read
     1:3:long skip(long):282:284 -> skip
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser -> com.android.tools.r8.u.b.a.w0.b.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser -> com.android.tools.r8.w.b.a.w0.b.d:
     1:1:void <clinit>():78:78 -> <clinit>
     1:1:void <init>():49:49 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):70:70 -> a
@@ -49888,7 +50105,7 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):196:196 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):209 -> b
     6:6:java.lang.Object parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):49 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString -> com.android.tools.r8.u.b.a.w0.b.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString -> com.android.tools.r8.w.b.a.w0.b.g:
     int bytesLength -> f
     int bytesOffset -> e
     1:14:void <init>(byte[],int,int):64:77 -> <init>
@@ -49903,8 +50120,8 @@
     1:1:java.util.Iterator iterator():47:47 -> iterator
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():130:130 -> iterator
     1:1:int size():107:107 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$1 -> com.android.tools.r8.u.b.a.w0.b.e:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$BoundedByteIterator -> com.android.tools.r8.u.b.a.w0.b.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$1 -> com.android.tools.r8.w.b.a.w0.b.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$BoundedByteIterator -> com.android.tools.r8.w.b.a.w0.b.f:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -49916,7 +50133,7 @@
     1:4:byte nextByte():153:156 -> nextByte
     5:5:byte nextByte():154:154 -> nextByte
     1:1:void remove():160:160 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.u.b.a.w0.b.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.w.b.a.w0.b.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> a
     boolean $assertionsDisabled -> b
     1:22:void <clinit>():60:81 -> <clinit>
@@ -49944,8 +50161,8 @@
     int peekCachedHashCode() -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output newOutput():751:751 -> f
     1:1:java.lang.String toString():1019:1019 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.u.b.a.w0.b.h:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.u.b.a.w0.b.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.w.b.a.w0.b.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.w.b.a.w0.b.i:
     int bufferPos -> e
     byte[] buffer -> d
     java.util.ArrayList flushedBuffers -> b
@@ -49970,7 +50187,7 @@
     3:3:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.u.b.a.w0.b.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.w.b.a.w0.b.l:
     int recursionLimit -> l
     int sizeLimit -> m
     int currentLimit -> j
@@ -50081,8 +50298,8 @@
     7:7:int readTag():158 -> p
     8:8:int readTag():158:158 -> p
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream$RefillCallback -> com.android.tools.r8.u.b.a.w0.b.k:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.u.b.a.w0.b.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream$RefillCallback -> com.android.tools.r8.w.b.a.w0.b.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.w.b.a.w0.b.n:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -50179,9 +50396,9 @@
     1:1:int computeInt32SizeNoTag(int):794:794 -> f
     int computeRawVarint32Size(int) -> g
     1:1:int computeTagSize(int):1185:1185 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.u.b.a.w0.b.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.w.b.a.w0.b.m:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.u.b.a.w0.b.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.w.b.a.w0.b.p:
     java.util.Map extensionsByNumber -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> b
     1:1:void <clinit>():159:159 -> <clinit>
@@ -50199,13 +50416,13 @@
     6:6:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     7:7:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite newInstance():92:92 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.u.b.a.w0.b.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.w.b.a.w0.b.o:
     java.lang.Object object -> a
     int number -> b
     1:3:void <init>(java.lang.Object,int):167:169 -> <init>
     1:5:boolean equals(java.lang.Object):178:182 -> equals
     1:1:int hashCode():174:174 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.u.b.a.w0.b.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.w.b.a.w0.b.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap fields -> a
     boolean isImmutable -> b
@@ -50459,8 +50676,8 @@
     1:5:void makeImmutable():107:111 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet emptySet():99:99 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.u.b.a.w0.b.q:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.u.b.a.w0.b.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.w.b.a.w0.b.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.w.b.a.w0.b.y:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -50552,15 +50769,15 @@
     144:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
     145:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> a
     147:149:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):735:737 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.u.b.a.w0.b.s:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.u.b.a.w0.b.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.w.b.a.w0.b.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.w.b.a.w0.b.t:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     1:45:void <init>():87:131 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder setUnknownFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):127:127 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.u.b.a.w0.b.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.w.b.a.w0.b.u:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -50594,7 +50811,7 @@
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> b
     1:1:boolean extensionsAreInitialized():471:471 -> e
     1:3:void ensureExtensionsIsMutable():350:352 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.u.b.a.w0.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.w.b.a.w0.b.v:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> a
     1:2:void <init>():171:172 -> <init>
     3:4:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):175:176 -> <init>
@@ -50630,7 +50847,7 @@
     1:1:int extensionsSerializedSize():316:316 -> h
     1:1:void makeExtensionsImmutable():261:261 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter newExtensionWriter():308:308 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.u.b.a.w0.b.v$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.w.b.a.w0.b.v$a:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage this$0 -> d
@@ -50667,7 +50884,7 @@
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):355 -> a
     14:14:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
     15:20:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):296:301 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.u.b.a.w0.b.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.w.b.a.w0.b.w:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -50678,7 +50895,7 @@
     1:1:int compareTo(java.lang.Object):671:671 -> compareTo
     2:2:int compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor):725:725 -> compareTo
     2:2:int compareTo(java.lang.Object):671 -> compareTo
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.u.b.a.w0.b.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.w.b.a.w0.b.x:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -50700,14 +50917,14 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> b
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.u.b.a.w0.b.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.w.b.a.w0.b.B:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.u.b.a.w0.b.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.w.b.a.w0.b.z:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.u.b.a.w0.b.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.w.b.a.w0.b.A:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.u.b.a.w0.b.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.w.b.a.w0.b.C:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -50716,14 +50933,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException negativeSize():78:78 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException recursionLimitExceeded():104:104 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.u.b.a.w0.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.w.b.a.w0.b.D:
     java.util.Iterator iterator -> a
     1:2:void <init>(java.util.Iterator):130:131 -> <init>
     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.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.u.b.a.w0.b.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.w.b.a.w0.b.G:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -50750,8 +50967,8 @@
     1:1:java.util.Iterator iterator():52:52 -> iterator
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.u.b.a.w0.b.E:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.u.b.a.w0.b.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.w.b.a.w0.b.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.w.b.a.w0.b.F:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -50762,12 +50979,12 @@
     1:1:java.lang.Object next():310 -> next
     1:3:byte nextByte():330:332 -> nextByte
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.u.b.a.w0.b.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.w.b.a.w0.b.H:
     boolean isInitialized() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.u.b.a.w0.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.w.b.a.w0.b.I:
     java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.u.b.a.w0.b.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.w.b.a.w0.b.N:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -50809,8 +51026,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.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.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.u.b.a.w0.b.J:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.u.b.a.w0.b.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.w.b.a.w0.b.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.w.b.a.w0.b.K:
     java.util.Stack prefixesStack -> a
     1:5:void <init>():602:606 -> <init>
     6:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):602:602 -> <init>
@@ -50832,7 +51049,7 @@
     47:47:void insert(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):664:664 -> a
     47:47:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):629 -> a
     48:53:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):630:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.u.b.a.w0.b.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.w.b.a.w0.b.L:
     java.util.Stack breadCrumbs -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):716:716 -> <init>
@@ -50853,7 +51070,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> next
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.u.b.a.w0.b.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.w.b.a.w0.b.M:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> a
     int bytesRemaining -> c
@@ -50864,7 +51081,7 @@
     1:1:java.lang.Object next():782 -> next
     1:5:byte nextByte():803:807 -> nextByte
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.u.b.a.w0.b.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.w.b.a.w0.b.T:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -50899,7 +51116,7 @@
     1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> m
     1:13:java.lang.Object remove(java.lang.Object):279:291 -> remove
     1:1:int size():202:202 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.u.b.a.w0.b.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.w.b.a.w0.b.O:
     1:1:void <init>(int):100:100 -> <init>
     1:5:void makeImmutable():104:108 -> k
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> k
@@ -50909,20 +51126,20 @@
     14:14:void makeImmutable():115 -> k
     15:20:void makeImmutable():116:121 -> k
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):100:100 -> put
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.u.b.a.w0.b.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.w.b.a.w0.b.S:
     java.util.Iterator ITERATOR -> a
     java.lang.Iterable ITERABLE -> b
     1:16:void <clinit>():591:606 -> <clinit>
     1:1:java.util.Iterator access$700():589:589 -> a
     1:1:java.lang.Iterable iterable():615:615 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.u.b.a.w0.b.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.w.b.a.w0.b.P:
     1:1:void <init>():591:591 -> <init>
     1:1:java.lang.Object next():598:598 -> next
     1:1:void remove():602:602 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.u.b.a.w0.b.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.w.b.a.w0.b.Q:
     1:1:void <init>():606:606 -> <init>
     1:1:java.util.Iterator iterator():609:609 -> iterator
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.u.b.a.w0.b.T$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.w.b.a.w0.b.T$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -50946,7 +51163,7 @@
     1:1:int hashCode():452:452 -> hashCode
     1:3:java.lang.Object setValue(java.lang.Object):431:433 -> setValue
     1:1:java.lang.String toString():458:458 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.u.b.a.w0.b.T$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.w.b.a.w0.b.T$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -50959,7 +51176,7 @@
     1:7:java.lang.Object next():532 -> next
     1:10:void remove():557:566 -> remove
     11:11:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.u.b.a.w0.b.T$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.w.b.a.w0.b.T$c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):470:470 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):470:470 -> <init>
@@ -50971,9 +51188,9 @@
     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.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.u.b.a.w0.b.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.w.b.a.w0.b.U:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):53:53 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.u.b.a.w0.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.w.b.a.w0.b.V:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -50982,10 +51199,10 @@
     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.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.u.b.a.w0.b.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.w.b.a.w0.b.d0:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.u.b.a.w0.b.W:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.u.b.a.w0.b.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.w.b.a.w0.b.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.w.b.a.w0.b.b0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType DOUBLE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType[] $VALUES -> u
     int wireType -> b
@@ -51014,19 +51231,19 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType getJavaType():143:143 -> a
     1:1:int getWireType():144:144 -> b
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.u.b.a.w0.b.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.w.b.a.w0.b.X:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):116:116 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.u.b.a.w0.b.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.w.b.a.w0.b.Y:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):119:119 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.u.b.a.w0.b.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.w.b.a.w0.b.Z:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):122:122 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.u.b.a.w0.b.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.w.b.a.w0.b.a0:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):125:125 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.u.b.a.w0.b.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.w.b.a.w0.b.c0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> d
@@ -51041,7 +51258,7 @@
     1:9:void <clinit>():78:86 -> <clinit>
     10:10:void <clinit>():77:77 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):88:89 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.u.b.a.x0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.w.b.a.x0.a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():78:78 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):48:48 -> <init>
@@ -51051,20 +51268,20 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor getDelegate():51:51 -> c
     1:1:void visitEnd():68 -> c
     2:2:void visitEnd():68:68 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.u.b.a.x0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.w.b.a.x0.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():260:260 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor):236:236 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):237:237 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():240:240 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.u.b.a.x0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.w.b.a.x0.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor):14:14 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int) -> a
     void visitModuleName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor getDelegate():15:15 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.u.b.a.x0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.w.b.a.x0.d:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):51:51 -> <init>
@@ -51093,7 +51310,7 @@
     3:3:java.lang.String getDesc():51:51 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.u.b.a.x0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.w.b.a.x0.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor delegate -> a
     1:1:void <clinit>():154:154 -> <clinit>
@@ -51103,14 +51320,14 @@
     void visitLambdaClassOriginName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():119:119 -> a
     1:1:void visitEnd():144:144 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.u.b.a.x0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.w.b.a.x0.f:
     1:1:void <init>():16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):16:16 -> <init>
     java.lang.String asString() -> a
     java.lang.String getDesc() -> b
     java.lang.String getName() -> c
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.u.b.a.x0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.w.b.a.x0.g:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):40:40 -> <init>
@@ -51139,7 +51356,7 @@
     3:3:java.lang.String getDesc():40:40 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.u.b.a.x0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.w.b.a.x0.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():108:108 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):86:86 -> <init>
@@ -51148,7 +51365,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor getDelegate():89:89 -> c
     1:1:void visitEnd():98 -> c
     2:2:void visitEnd():98:98 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.u.b.a.x0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.w.b.a.x0.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():229:229 -> <clinit>
@@ -51158,7 +51375,7 @@
     void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():165:165 -> a
     1:1:void visitEnd():219:219 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.u.b.a.x0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.w.b.a.x0.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():341:341 -> <clinit>
@@ -51168,7 +51385,7 @@
     void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():307:307 -> a
     1:1:void visitEnd():331:331 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.u.b.a.x0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.w.b.a.x0.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> a
     1:1:void <clinit>():296:296 -> <clinit>
@@ -51177,7 +51394,7 @@
     void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():271:271 -> a
     1:1:void visitEnd():286:286 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.u.b.a.x0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.w.b.a.x0.l:
     java.lang.String packageName -> g
     java.lang.String extraString -> f
     int[] COMPATIBLE_METADATA_VERSION -> i
@@ -51198,13 +51415,13 @@
     1:1:int getKind():44:44 -> f
     1:1:int[] getMetadataVersion():52:52 -> g
     1:1:java.lang.String getPackageName():88:88 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.u.b.a.x0.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.w.b.a.x0.A:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader header -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion Companion -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.u.b.a.x0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.w.b.a.x0.o:
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> d
     com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
@@ -51216,7 +51433,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
     4:5:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):48:49 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.u.b.a.x0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.w.b.a.x0.m:
     1:1:void <init>():55:55 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):68:69 -> f
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
@@ -51242,7 +51459,7 @@
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.u.b.a.x0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.w.b.a.x0.n:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair invoke():31:33 -> a
     1:3:java.lang.Object invoke():29 -> a
@@ -51253,10 +51470,10 @@
     5:5:java.lang.Object invoke():29 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():32:32 -> a
     6:6:java.lang.Object invoke():29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.u.b.a.x0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.w.b.a.x0.p:
     1:1:void <init>():326:326 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):326:326 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.u.b.a.x0.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.w.b.a.x0.s:
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> d
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
@@ -51268,7 +51485,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
     4:5:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):103:104 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.u.b.a.x0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.w.b.a.x0.q:
     1:1:void <init>():110:110 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):123:124 -> e
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> e
@@ -51278,7 +51495,7 @@
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int[],int):128:131 -> e
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):125 -> e
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.u.b.a.x0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.w.b.a.x0.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair invoke():86:88 -> a
     1:3:java.lang.Object invoke():84 -> a
@@ -51289,9 +51506,9 @@
     5:5:java.lang.Object invoke():84 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():87:87 -> a
     6:6:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.u.b.a.x0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.w.b.a.x0.t:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.u.b.a.x0.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.w.b.a.x0.w:
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> d
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
@@ -51303,7 +51520,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
     4:5:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):285:286 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.u.b.a.x0.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.w.b.a.x0.u:
     1:1:void <init>():292:292 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):307:308 -> a
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
@@ -51313,7 +51530,7 @@
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String,int[],int[],int):312:315 -> a
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):309 -> a
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.u.b.a.x0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.w.b.a.x0.v:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair invoke():262:264 -> a
     1:3:java.lang.Object invoke():260 -> a
@@ -51324,16 +51541,16 @@
     5:5:java.lang.Object invoke():260 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():263:263 -> a
     6:6:java.lang.Object invoke():260 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.u.b.a.x0.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.w.b.a.x0.y:
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.u.b.a.x0.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.w.b.a.x0.x:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair invoke():142:143 -> a
     1:2:java.lang.Object invoke():140 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.u.b.a.x0.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.w.b.a.x0.z:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):324:324 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.u.b.a.x0.B.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.w.b.a.x0.B.a:
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
     java.lang.String moduleName -> d
@@ -51348,7 +51565,7 @@
     189:189:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):40:40 -> a
     190:190:void visitModuleName(java.lang.String):43:43 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):47:47 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.u.b.a.x0.B.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.w.b.a.x0.B.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():133:133 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):133:133 -> a
@@ -51357,7 +51574,7 @@
     145:145:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor):141:141 -> a
     145:145:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):133 -> a
     146:146:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):137:137 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.u.b.a.x0.B.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.w.b.a.x0.B.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
     1:1:void <init>():82:82 -> <init>
@@ -51368,7 +51585,7 @@
     101:101:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):82 -> a
     102:102:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):87:87 -> a
     103:103:void visitLambdaClassOriginName(java.lang.String):91:91 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.u.b.a.x0.B.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.w.b.a.x0.B.m:
     1:1:void <init>():17:17 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor writeClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):108:109 -> a
     3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor writePackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):131:132 -> a
@@ -51400,45 +51617,45 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension createPropertyExtension():267:267 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():273:273 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():271:271 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.w.b.a.x0.B.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):109:109 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):116:116 -> a
     2:3:void visitModuleName(java.lang.String):121:122 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):111:111 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.u.b.a.x0.B.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.w.b.a.x0.B.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):109:109 -> a
     2:119:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:117 -> a
     2:119:java.lang.Object invoke(java.lang.Object):109 -> a
     120:120:java.lang.Object invoke(java.lang.Object):109:109 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.w.b.a.x0.B.f:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):226:226 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):229:229 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.w.b.a.x0.B.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder $proto -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):151:151 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):154:154 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.w.b.a.x0.B.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder):132:132 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):135:135 -> a
     2:3:void visitModuleName(java.lang.String):140:141 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.u.b.a.x0.B.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.w.b.a.x0.B.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):132:132 -> a
     2:138:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:136 -> a
     2:138:java.lang.Object invoke(java.lang.Object):132 -> a
     139:139:java.lang.Object invoke(java.lang.Object):132:132 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.w.b.a.x0.B.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder signature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder $proto -> g
@@ -51466,18 +51683,18 @@
     9:9:void visitEnd():216 -> b
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447:3447 -> b
     10:10:void visitEnd():216 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.w.b.a.x0.B.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):248:248 -> <init>
     1:1:void visit(boolean):251:251 -> a
     2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):256:256 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.w.b.a.x0.B.l:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):239:239 -> <init>
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.u.b.a.x0.B.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.w.b.a.x0.B.n:
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
     1:2:void <init>():61:62 -> <init>
@@ -51490,7 +51707,7 @@
     187:187:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
     188:188:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):66:66 -> a
     189:189:void visitModuleName(java.lang.String):69:69 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.u.b.a.x0.B.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.w.b.a.x0.B.o:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
     int jvmFlags -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> d
@@ -51504,7 +51721,7 @@
     132:132:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):102 -> a
     133:136:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):115:118 -> a
     137:137:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.u.b.a.x0.B.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.w.b.a.x0.B.p:
     java.util.List annotations -> d
     boolean isRaw -> c
     1:3:void <init>():160:162 -> <init>
@@ -51517,7 +51734,7 @@
     185:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
     186:186:void visit(boolean):165:165 -> a
     187:187:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.u.b.a.x0.B.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.w.b.a.x0.B.q:
     java.util.List annotations -> c
     1:2:void <init>():146:147 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146:146 -> a
@@ -52075,7 +52292,7 @@
     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.kotlin.Kotlin -> com.android.tools.r8.v.a:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.x.a:
     java.lang.String KOTLIN -> g
     java.lang.String NAME -> f
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
@@ -52087,8 +52304,8 @@
     1:22:void <init>(com.android.tools.r8.graph.DexItemFactory):44:65 -> <init>
     1:1:java.lang.String addKotlinPrefix(java.lang.String):33:33 -> a
     2:2:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.v.a$a:
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.v.a$b:
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.x.a$a:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.x.a$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap functions -> a
     com.android.tools.r8.graph.DexString kotlinStyleLambdaInstanceName -> b
     boolean $assertionsDisabled -> f
@@ -52108,7 +52325,7 @@
     3:3:int getArity(com.android.tools.r8.graph.DexType):105 -> a
     4:6:int getArity(com.android.tools.r8.graph.DexType):105:107 -> a
     1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):101:101 -> b
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.v.a$c:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.x.a$c:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexMethod throwNpe -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
@@ -52118,7 +52335,7 @@
     5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):126:129 -> <init>
     9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):128:132 -> <init>
     14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):131:131 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.v.a$d:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.x.a$d:
     com.android.tools.r8.graph.DexString kind -> b
     com.android.tools.r8.graph.DexString metadataVersion -> c
     com.android.tools.r8.graph.DexString bytecodeVersion -> d
@@ -52130,7 +52347,7 @@
     com.android.tools.r8.graph.DexString extraInt -> i
     com.android.tools.r8.graph.DexType kotlinMetadataType -> a
     1:10:void <init>(com.android.tools.r8.kotlin.Kotlin):111:120 -> <init>
-com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.v.b:
+com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.x.b:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass kmClass -> e
     1:1:void <clinit>():33:33 -> <clinit>
@@ -52140,7 +52357,7 @@
     58:58:boolean lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):90:90 -> a
     1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():117:119 -> b
     1:3:void processMetadata():50:52 -> d
-com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.v.c:
+com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.x.c:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,com.android.tools.r8.graph.DexClass):25:25 -> <init>
@@ -52148,7 +52365,7 @@
     5:6:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):38:39 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():45:45 -> b
     1:2:void processMetadata():30:31 -> d
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.v.e:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.x.e:
     1:15:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):28:42 -> a
     16:16:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):40:40 -> a
     17:19:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):36:38 -> a
@@ -52200,9 +52417,9 @@
     5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):129:129 -> b
     1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):115:122 -> c
     9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):116:116 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.v.d:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.x.d:
     1:1:void <init>(java.lang.String):136:136 -> <init>
-com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.v.f:
+com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.x.f:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage kmPackage -> e
     1:1:void <clinit>():22:22 -> <clinit>
@@ -52214,7 +52431,7 @@
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():69 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():69:69 -> b
     1:3:void processMetadata():40:42 -> d
-com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.v.g:
+com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.x.g:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage kmPackage -> e
     1:1:void <clinit>():22:22 -> <clinit>
@@ -52223,7 +52440,7 @@
     5:17:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):47:59 -> a
     1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():66:68 -> b
     1:3:void processMetadata():40:42 -> d
-com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.v.h:
+com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.x.h:
     com.android.tools.r8.graph.DexClass clazz -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata metadata -> a
     boolean isProcessed -> c
@@ -52236,7 +52453,7 @@
     boolean isSyntheticClass() -> c
     void processMetadata() -> d
     1:2:java.lang.String toString():83:84 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.v.i:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.x.i:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> b
@@ -52275,7 +52492,7 @@
     92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     92:92:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41 -> a
     93:93:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):45:45 -> a
-com.android.tools.r8.kotlin.KotlinMetadataSynthesizer -> com.android.tools.r8.v.j:
+com.android.tools.r8.kotlin.KotlinMetadataSynthesizer -> com.android.tools.r8.x.j:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:boolean isExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):29:29 -> a
@@ -52312,7 +52529,7 @@
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.getReturnType():312:312 -> b
     13:13:boolean isCompatibleFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):108 -> b
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionAsExtension(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):189:189 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.v.k:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.x.k:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:21:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):113:133 -> a
@@ -52349,8 +52566,8 @@
     2:26:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
     27:34:void addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):239:246 -> b
     27:34:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.v.k$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.v.k$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.x.k$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.x.k$b:
     java.io.BufferedReader reader -> a
     java.lang.String readLine -> b
     boolean $assertionsDisabled -> c
@@ -52364,25 +52581,25 @@
     1:1:java.lang.String readNextLine():49:49 -> b
     2:5:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):69:72 -> b
     1:1:void close():108:108 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.v.k$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.x.k$c:
     1:1:void <init>(java.lang.String):34:34 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.v.k$d:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.x.k$d:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):304:306 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():314:314 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():310:310 -> b
     1:10:java.lang.String toString():319:328 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.v.k$e:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.x.k$e:
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:2:void <init>(com.android.tools.r8.utils.SegmentTree):254:255 -> <init>
     1:1:java.util.Map$Entry lookup(int):259:259 -> a
     2:2:int size():263:263 -> a
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.v.k$f:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.x.k$f:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:4:void <init>():267:270 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.v.k$g:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.x.k$g:
     java.lang.String fileName -> a
     java.lang.String path -> b
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):277:277 -> <init>
@@ -52390,7 +52607,7 @@
     1:1:java.lang.String getFileName():287:287 -> a
     1:1:java.lang.String getPath():291:291 -> b
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.v.m:
+com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.x.m:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour flavour -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():14:14 -> <clinit>
@@ -52409,13 +52626,13 @@
     1:3:void processMetadata():45:47 -> d
     1:1:boolean isJavaStyleLambda():74:74 -> e
     1:1:boolean isKotlinStyleLambda():70:70 -> f
-com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.v.l:
+com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.x.l:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour KotlinStyleLambda -> a
     1:3:void <clinit>():16:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.logging.Log -> com.android.tools.r8.w.a:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.y.a:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -52799,12 +53016,12 @@
     87:87:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):124 -> a
     88:89:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
     90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    90:90:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):287 -> a
+    90:90:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):294 -> a
     90:90:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
-    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):288:288 -> a
+    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):295:295 -> a
     91:91:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     92:93:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128:129 -> a
-    94:94:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):287:287 -> a
+    94:94:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):294:294 -> a
     94:94:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     95:99:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):143:147 -> a
     100:100:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):26:26 -> a
@@ -54165,7 +54382,7 @@
     1:1:void parsedIdentifier(java.lang.String):167:167 -> b
     2:2:void start():223:223 -> b
     1:1:java.lang.String getRenamedSignature():157:157 -> c
-com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.x.a:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.z.a:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
     com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> d
@@ -54183,7 +54400,7 @@
     91:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):114:114 -> a
     91:91:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):87 -> a
     92:92:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.x.c:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.z.c:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> a
     com.android.tools.r8.graph.DexMethod target -> b
     boolean $assertionsDisabled -> c
@@ -54205,7 +54422,7 @@
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):87:87 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):92:92 -> registerStaticFieldWrite
     1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):97:97 -> registerTypeReference
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.x.b:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.z.b:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind ILLEGAL -> d
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind NONE -> e
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind STATIC -> b
@@ -54213,7 +54430,7 @@
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind VIRTUAL -> a
     1:5:void <clinit>():101:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.x.d:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.z.d:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.optimize.MemberRebindingLense$Builder builder -> d
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -54303,19 +54520,19 @@
     2:4:void computeFieldRebinding():282:284 -> b
     5:9:boolean isTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):319:323 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):114:114 -> c
-com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.x.f:
+com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.z.f:
     com.android.tools.r8.graph.AppView appView -> a
     1:7:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):43:49 -> <init>
     8:16:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):42:50 -> <init>
     1:1:com.android.tools.r8.optimize.MemberRebindingLense$Builder builder(com.android.tools.r8.graph.AppView):54:54 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):59:59 -> mapInvocationType
-com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.x.e:
+com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.z.e:
     com.android.tools.r8.graph.AppView appView -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
     1:5:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.GraphLense):27:31 -> a
-com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.x.i:
+com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.z.i:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set publicizedMethods -> b
     boolean $assertionsDisabled -> c
@@ -54333,15 +54550,15 @@
     11:14:boolean publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):59:62 -> lookupMethod
     11:14:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):48 -> lookupMethod
     15:17:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):49:51 -> lookupMethod
-com.android.tools.r8.optimize.PublicizerLense$1 -> com.android.tools.r8.x.g:
-com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.x.h:
+com.android.tools.r8.optimize.PublicizerLense$1 -> com.android.tools.r8.z.g:
+com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.z.h:
     java.util.Set publicizedMethods -> a
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLense$1):70:70 -> <init>
     2:2:void <init>():73:73 -> <init>
     3:3:void <init>():71:71 -> <init>
     1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.AppView):77:80 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):84:84 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.x.j:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.z.j:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer unneededVisibilityBridgeConsumer -> b
     boolean $assertionsDisabled -> c
@@ -54364,7 +54581,7 @@
     43:43:void run():105:105 -> a
     44:50:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):36:42 -> a
     44:50:void run():106 -> a
-com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.y.a.a.a:
+com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.A.a.a.a:
     1:1:void <init>(int):56:56 -> <init>
     2:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):67:69 -> <init>
     void visit(java.lang.String,java.lang.Object) -> a
@@ -54372,7 +54589,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String) -> a
     void visitEnd() -> a
     void visitEnum(java.lang.String,java.lang.String,java.lang.String) -> a
-com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.y.a.a.b:
+com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.A.a.a.b:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter previousAnnotation -> f
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter nextAnnotation -> g
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> a
@@ -54405,7 +54622,7 @@
     179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):496:498 -> a
     182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):524:547 -> a
     1:8:int computeAnnotationsSize(java.lang.String):332:339 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.y.a.a.d:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.A.a.a.d:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -54430,7 +54647,7 @@
     31:31:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
     32:34:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):313:315 -> a
     35:45:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
-com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.y.a.a.c:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.A.a.a.c:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -54440,7 +54657,7 @@
     5:10:void add(com.android.tools.r8.org.objectweb.asm.Attribute):384:389 -> a
     5:10:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):362 -> a
     11:11: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.y.a.a.e:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.A.a.a.e:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -54459,7 +54676,7 @@
     20:30:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> c
     1:5:void enlarge(int):355:359 -> d
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.y.a.a.f:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.A.a.a.f:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     byte[] b -> a
@@ -54645,9 +54862,9 @@
     1:2:int readUnsignedShort(int):3362:3363 -> f
     3:9:java.lang.String readUtf(int,char[]):3436:3442 -> f
     1:25:int[] readBootstrapMethodsAttribute(int):3241:3265 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.y.a.a.g:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.A.a.a.g:
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.y.a.a.h:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.A.a.a.h:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -54669,7 +54886,7 @@
     35:36:void visitEnd():325:326 -> a
     1:5:void visitNestMember(java.lang.String):235:239 -> b
     6:6:void visitNestMember(java.lang.String):236:236 -> b
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.y.a.a.i:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.A.a.a.i:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
     int interfaceCount -> h
@@ -54721,7 +54938,7 @@
     224:243:byte[] toByteArray():639 -> b
     244:244:byte[] toByteArray():641:641 -> b
     245:245:byte[] toByteArray():538:538 -> b
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.y.a.a.j:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.A.a.a.j:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -54734,7 +54951,7 @@
     1:8:boolean equals(java.lang.Object):155:162 -> equals
     1:4:int hashCode():167:170 -> hashCode
     1:7:java.lang.String toString():175:181 -> toString
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.y.a.a.k:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.A.a.a.k:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -54755,15 +54972,15 @@
     int[] currentLocalVariableAnnotationRangeIndices -> l
     int currentFrameLocalCountDelta -> p
     1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.y.a.a.l:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.A.a.a.l:
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.Label):40:40 -> <init>
     1:4:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):51:54 -> a
-com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.y.a.a.m:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.A.a.a.m:
     com.android.tools.r8.org.objectweb.asm.Label successor -> b
     int info -> a
     com.android.tools.r8.org.objectweb.asm.Edge nextEdge -> c
     1:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Edge):86:89 -> <init>
-com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.y.a.a.n:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.A.a.a.n:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
     1:1:void <init>(int):55:55 -> <init>
     2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):66:71 -> <init>
@@ -54771,7 +54988,7 @@
     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
     1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):119:120 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.y.a.a.o:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.A.a.a.o:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> l
@@ -54791,7 +55008,7 @@
     14:66:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):220:272 -> a
     67:67:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
     1:14:int computeFieldInfoSize():195:208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.y.a.a.p:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.A.a.a.p:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -54888,7 +55105,7 @@
     12:16:int pop():567:571 -> b
     17:23:void pop(int):581:587 -> b
     1:16:void push(int):524:539 -> c
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.y.a.a.q:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.A.a.a.q:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -54903,7 +55120,7 @@
     1:9:boolean equals(java.lang.Object):159:167 -> equals
     1:3:int hashCode():172:174 -> hashCode
     1:1:java.lang.String toString():187:187 -> toString
-com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.y.a.a.r:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.A.a.a.r:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -54919,7 +55136,7 @@
     25:26: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
     25:26: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 -> a
     27:28: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
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.y.a.a.s:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.A.a.a.s:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
     int bytecodeOffset -> e
@@ -54947,9 +55164,9 @@
     92:126:void addSubroutineRetSuccessors(com.android.tools.r8.org.objectweb.asm.Label):541:575 -> a
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):591:603 -> b
     1:1:java.lang.String toString():619:619 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.y.a.a.t:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.A.a.a.t:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):57:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.y.a.a.u:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.A.a.a.u:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):69:69 -> <init>
@@ -54994,7 +55211,7 @@
     7:8:void visitMaxs(int,int):761:762 -> c
     9:10:void visitEnd():771:772 -> c
     1:2:void visitVarInsn(int,int):347:348 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.y.a.a.v:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.A.a.a.v:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
     int nameIndex -> l
     boolean hasAsmInstructions -> f0
@@ -55183,7 +55400,7 @@
     197:214: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):1453:1470 -> g
     197:214:void putAbstractTypes(int,int):1956 -> g
     1:10:void endCurrentBasicBlockWithNoSuccessor():1791:1800 -> h
-com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.y.a.a.w:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.A.a.a.w:
     1:1:void <init>(int):55:55 -> <init>
     2:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):66:68 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
@@ -55193,7 +55410,7 @@
     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.y.a.a.x:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.A.a.a.x:
     com.android.tools.r8.org.objectweb.asm.ByteVector provides -> n
     int packageCount -> o
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> l
@@ -55222,7 +55439,7 @@
     3:12:void visitOpen(java.lang.String,int,java.lang.String[]):146:155 -> b
     13:13:int getAttributeCount():186:186 -> b
     1:2:void visitUse(java.lang.String):160:161 -> c
-com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.y.a.a.y:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.A.a.a.y:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -55231,7 +55448,7 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():376:382 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.y.a.a.A:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.A.a.a.A:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -55374,7 +55591,7 @@
     2:2:int addType(java.lang.String):1138 -> e
     3:10:int addType(java.lang.String):1139:1146 -> e
     1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
-com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.y.a.a.z:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.A.a.a.z:
     long com.android.tools.r8.org.objectweb.asm.Symbol.data -> f
     int hashCode -> h
     int com.android.tools.r8.org.objectweb.asm.Symbol.info -> g
@@ -55401,7 +55618,7 @@
     40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1296:1296 -> <init>
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.y.a.a.B:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.A.a.a.B:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
     com.android.tools.r8.org.objectweb.asm.Type INT_TYPE -> j
     com.android.tools.r8.org.objectweb.asm.Type DOUBLE_TYPE -> m
@@ -55438,7 +55655,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
     1:4:int hashCode():873:876 -> hashCode
     1:1:java.lang.String toString():889:889 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.y.a.a.C:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.A.a.a.C:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -55455,7 +55672,7 @@
     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.commons.JSRInlinerAdapter -> com.android.tools.r8.y.a.a.D.b:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.A.a.a.D.b:
     java.util.BitSet sharedSubroutineInsns -> F
     java.util.Map subroutinesInsns -> E
     java.util.BitSet mainSubroutineInsns -> D
@@ -55494,7 +55711,7 @@
     103:105:void emitCode():307:309 -> c
     103:105:void visitEnd():147 -> c
     106:107:void visitEnd():149:150 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.y.a.a.D.a:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.A.a.a.D.a:
     java.util.Map clonedLabels -> c
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> a
     java.util.BitSet subroutineInsns -> b
@@ -55511,7 +55728,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):550:550 -> get
     1:1:java.lang.Object get(java.lang.Object):419 -> get
     1:1:int hashCode():560:560 -> hashCode
-com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.y.a.a.E.a:
+com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.A.a.a.E.a:
     java.util.List visibleTypeAnnotations -> b
     java.util.List invisibleTypeAnnotations -> c
     int index -> f
@@ -55528,7 +55745,7 @@
     1:5:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):180:184 -> b
     6:15:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):183:192 -> b
     16:16:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):191:191 -> b
-com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.y.a.a.E.b:
+com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.A.a.a.E.b:
     java.util.List values -> b
     java.lang.String desc -> a
     1:3:void <init>(java.lang.String):63:65 -> <init>
@@ -55562,7 +55779,7 @@
     82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):150:158 -> a
     91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):189:196 -> a
     99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):210:226 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.y.a.a.E.c:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.A.a.a.E.c:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -55570,7 +55787,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:89 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):94:94 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.y.a.a.E.d:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.A.a.a.E.d:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -55589,14 +55806,14 @@
     25:44:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):152:171 -> a
     45:51:java.lang.Object[] asArray(java.util.List):178:184 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.y.a.a.E.e:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.A.a.a.E.e:
     int incr -> h
     int var -> g
     1:3:void <init>(int,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.y.a.a.E.f:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.A.a.a.E.f:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode firstInsn -> b
     int size -> a
@@ -55611,18 +55828,18 @@
     5:10:void resetLabels():469:474 -> b
     1:1:int size():61:61 -> c
     1:6:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] toArray():176:181 -> d
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.y.a.a.E.g:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.A.a.a.E.g:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):71:71 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.y.a.a.E.h:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.A.a.a.E.h:
     int operand -> g
     1:2:void <init>(int,int):51:52 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):71:72 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):77:77 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.y.a.a.E.i:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.A.a.a.E.i:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -55631,7 +55848,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):84:85 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.y.a.a.E.j:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.A.a.a.E.j:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode label -> g
     1:2:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):57:58 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):79:80 -> a
@@ -55640,7 +55857,7 @@
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85:85 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.y.a.a.E.k:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.A.a.a.E.k:
     com.android.tools.r8.org.objectweb.asm.Label value -> g
     1:1:void <init>():40:40 -> <init>
     1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:68 -> a
@@ -55648,13 +55865,13 @@
     int getType() -> b
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> c
     1:1:void resetLabel():77:77 -> d
-com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.y.a.a.E.l:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.A.a.a.E.l:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):55:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.y.a.a.E.m:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.A.a.a.E.m:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> h
     int line -> g
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):55:57 -> <init>
@@ -55664,14 +55881,14 @@
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.y.a.a.E.n:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.A.a.a.E.n:
     java.util.List end -> f
     java.util.List start -> e
     java.util.List index -> g
     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:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):128:137 -> a
     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.y.a.a.E.o:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.A.a.a.E.o:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -55679,7 +55896,7 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> d
     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>
-com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.y.a.a.E.p:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.A.a.a.E.p:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -55690,7 +55907,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     13:15:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.y.a.a.E.q:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.A.a.a.E.q:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -55699,7 +55916,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):115:116 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):121:121 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.y.a.a.E.s:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.A.a.a.E.s:
     java.util.List attrs -> p
     java.util.List invisibleTypeAnnotations -> o
     java.lang.String desc -> j
@@ -55788,22 +56005,22 @@
     1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):278:288 -> c
     12:13:void visitMaxs(int,int):550:551 -> c
     1:1:void visitVarInsn(int,int):370:370 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.y.a.a.E.r:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.A.a.a.E.r:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):249:249 -> <init>
     1:2:boolean add(java.lang.Object):252:253 -> add
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.y.a.a.E.t:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.A.a.a.E.t:
     java.lang.String desc -> g
     int dims -> h
     1:3:void <init>(java.lang.String,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.y.a.a.E.u:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.A.a.a.E.u:
     java.lang.String name -> a
     int access -> b
     1:3:void <init>(java.lang.String,int):55:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.y.a.a.E.v:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.A.a.a.E.v:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -55815,7 +56032,7 @@
     8:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     9:10:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.y.a.a.E.w:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.A.a.a.E.w:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -55823,29 +56040,29 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
     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):73:77 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.y.a.a.E.x:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.A.a.a.E.x:
     int typeRef -> c
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> d
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):62:64 -> <init>
     4:6:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):81:83 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.y.a.a.E.y:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.A.a.a.E.y:
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:78 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):83:83 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.y.a.a.E.z:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.A.a.a.E.z:
     1:3:java.util.List asArrayList(int):44:46 -> a
     4:8:java.util.List asArrayList(java.lang.Object[]):53:57 -> a
     9:13:java.util.List asArrayList(int[]):108:112 -> a
     14:16:java.util.List asArrayList(int,java.lang.Object[]):151:153 -> a
-com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.y.a.a.E.A:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.A.a.a.E.A:
     int var -> g
     1:2:void <init>(int,int):53:54 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:75 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):80:80 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.y.a.a.F.a:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.A.a.a.F.a:
     java.lang.String[] OPCODES -> a
     1:1:void <clinit>():53:53 -> <clinit>
 com.android.tools.r8.origin.ArchiveEntryOrigin -> com.android.tools.r8.origin.ArchiveEntryOrigin:
@@ -56085,49 +56302,58 @@
     1:1:void <init>():12:12 -> <init>
 com.android.tools.r8.retrace.Retrace -> com.android.tools.r8.retrace.Retrace:
     boolean $assertionsDisabled -> a
-    1:5:void <clinit>():33:37 -> <clinit>
-    1:1:void <init>():34:34 -> <init>
-    1:7:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):91:97 -> a
-    8:9:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):93:94 -> a
-    10:12:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):93:95 -> a
-    13:13:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path):97:97 -> a
-    14:14:void lambda$run$1(java.util.List):152:152 -> a
-    15:15:void lambda$main$2(java.lang.String[]):161:161 -> a
-    1:1:void run(java.lang.String[]):143:143 -> b
-    2:28:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):42:68 -> b
-    2:28:void run(java.lang.String[]):144 -> b
-    29:29:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):103:103 -> b
-    29:29:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):68 -> b
-    29:29:void run(java.lang.String[]):144 -> b
-    30:31:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):68:69 -> b
-    30:31:void run(java.lang.String[]):144 -> b
-    32:33:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):105:106 -> b
-    32:33:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):68 -> b
-    32:33:void run(java.lang.String[]):144 -> b
-    34:36:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):72:74 -> b
-    34:36:void run(java.lang.String[]):144 -> b
-    37:41:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):72:76 -> b
-    37:41:void run(java.lang.String[]):144 -> b
-    42:45:java.util.List getStackTraceFromStandardInput():165:168 -> b
-    42:45:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):84 -> b
-    42:45:void run(java.lang.String[]):144 -> b
-    46:46:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):84:84 -> b
-    46:46:void run(java.lang.String[]):144 -> b
-    47:53:void run(java.lang.String[]):147:153 -> b
-    54:55:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):80:81 -> b
-    54:55:void run(java.lang.String[]):144 -> b
-    1:1:void main(java.lang.String[]):161:161 -> main
-    2:10:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):181:189 -> main
-    2:10:void main(java.lang.String[]):161 -> main
-    11:11:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):184:184 -> main
-    11:11:void main(java.lang.String[]):161 -> main
-    1:21:void run(com.android.tools.r8.retrace.RetraceCommand):117:137 -> run
-    22:24:void run(com.android.tools.r8.retrace.RetraceCommand):136:138 -> run
+    1:5:void <clinit>():34:38 -> <clinit>
+    1:1:void <init>():35:35 -> <init>
+    1:7:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):95:101 -> a
+    8:9:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):97:98 -> a
+    10:12:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):97:99 -> a
+    13:13:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path):101:101 -> a
+    14:14:void lambda$run$1(java.util.List):159:159 -> a
+    15:15:void lambda$main$2(java.lang.String[]):169:169 -> a
+    1:1:void main(java.lang.String[]):169:169 -> main
+    2:10:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):189:197 -> main
+    2:10:void main(java.lang.String[]):169 -> main
+    11:11:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):192:192 -> main
+    11:11:void main(java.lang.String[]):169 -> main
+    1:22:void run(com.android.tools.r8.retrace.RetraceCommand):121:142 -> run
+    23:25:void run(com.android.tools.r8.retrace.RetraceCommand):141:143 -> run
+    26:28:void run(java.lang.String[]):148:150 -> run
+    29:58:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):43:72 -> run
+    29:58:void run(java.lang.String[]):151 -> run
+    59:59:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):107:107 -> run
+    59:59:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):72 -> run
+    59:59:void run(java.lang.String[]):151 -> run
+    60:61:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):72:73 -> run
+    60:61:void run(java.lang.String[]):151 -> run
+    62:63:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):109:110 -> run
+    62:63:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):72 -> run
+    62:63:void run(java.lang.String[]):151 -> run
+    64:66:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):76:78 -> run
+    64:66:void run(java.lang.String[]):151 -> run
+    67:71:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):76:80 -> run
+    67:71:void run(java.lang.String[]):151 -> run
+    72:75:java.util.List getStackTraceFromStandardInput():173:176 -> run
+    72:75:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):88 -> run
+    72:75:void run(java.lang.String[]):151 -> run
+    76:76:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):88:88 -> run
+    76:76:void run(java.lang.String[]):151 -> run
+    77:83:void run(java.lang.String[]):154:160 -> run
+    84:85:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler) -> run
+    84:85:void run(java.lang.String[]):151 -> run
 com.android.tools.r8.retrace.Retrace$1 -> com.android.tools.r8.retrace.Retrace$a:
-    1:1:void <init>():143:143 -> <init>
+    1:1:void <init>():150:150 -> <init>
 com.android.tools.r8.retrace.Retrace$MainAction -> com.android.tools.r8.retrace.Retrace$b:
 com.android.tools.r8.retrace.Retrace$RetraceAbortException -> com.android.tools.r8.retrace.Retrace$c:
-    1:1:void <init>():173:173 -> <init>
+    1:1:void <init>():181:181 -> <init>
+com.android.tools.r8.retrace.Retrace$RetraceDiagnosticsHandler -> com.android.tools.r8.retrace.Retrace$d:
+    com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> a
+    boolean printInfo -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():201:201 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.DiagnosticsHandler,boolean):206:209 -> <init>
+    1:1:void error(com.android.tools.r8.Diagnostic):214:214 -> error
+    1:2:void info(com.android.tools.r8.Diagnostic):224:225 -> info
+    1:1:void warning(com.android.tools.r8.Diagnostic):219:219 -> warning
 com.android.tools.r8.retrace.RetraceBase -> com.android.tools.r8.retrace.c:
     com.android.tools.r8.retrace.RetraceClassResult retrace(com.android.tools.r8.references.ClassReference) -> a
     com.android.tools.r8.retrace.RetraceMethodResult retrace(com.android.tools.r8.references.MethodReference) -> a
@@ -56196,36 +56422,39 @@
 com.android.tools.r8.retrace.RetraceClassResult$ResultConstructor -> com.android.tools.r8.retrace.RetraceClassResult$b:
     java.lang.Object create(com.android.tools.r8.retrace.RetraceClassResult$Element,java.lang.Object,java.lang.String) -> a
 com.android.tools.r8.retrace.RetraceCommand -> com.android.tools.r8.retrace.RetraceCommand:
-    com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
-    com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer proguardMapProducer -> c
-    java.util.List stackTrace -> d
-    boolean $assertionsDisabled -> f
-    java.lang.String regularExpression -> a
-    java.util.function.Consumer retracedStackTraceConsumer -> e
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:1:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,java.util.List,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceCommand$1):13:13 -> <init>
-    2:13:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,java.util.List,java.util.function.Consumer):28:39 -> <init>
-    1:1:com.android.tools.r8.retrace.RetraceCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):48:48 -> a
-    2:2:com.android.tools.r8.retrace.RetraceCommand$Builder builder():53:53 -> a
+    com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
+    java.util.List stackTrace -> e
+    com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer proguardMapProducer -> d
+    boolean $assertionsDisabled -> g
+    java.util.function.Consumer retracedStackTraceConsumer -> f
+    boolean isVerbose -> a
+    java.lang.String regularExpression -> b
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,java.util.List,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceCommand$1):14:14 -> <init>
+    2:13:void <init>(boolean,java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer,java.util.List,java.util.function.Consumer):29:40 -> <init>
+    1:1:com.android.tools.r8.retrace.RetraceCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):49:49 -> a
+    2:2:com.android.tools.r8.retrace.RetraceCommand$Builder builder():54:54 -> a
 com.android.tools.r8.retrace.RetraceCommand$1 -> com.android.tools.r8.retrace.RetraceCommand$a:
-    1:1:void <init>():53:53 -> <init>
+    1:1:void <init>():54:54 -> <init>
 com.android.tools.r8.retrace.RetraceCommand$Builder -> com.android.tools.r8.retrace.RetraceCommand$b:
-    com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> a
-    com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer proguardMapProducer -> b
-    java.util.List stackTrace -> d
-    java.util.function.Consumer retracedStackTraceConsumer -> e
-    java.lang.String regularExpression -> c
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$1):56:56 -> <init>
-    2:3:void <init>(com.android.tools.r8.DiagnosticsHandler):65:66 -> <init>
-    1:1:com.android.tools.r8.retrace.RetraceCommand$Builder setProguardMapProducer(com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer):81:81 -> a
-    2:2:com.android.tools.r8.retrace.RetraceCommand$Builder setRegularExpression(java.lang.String):92:92 -> a
-    3:3:com.android.tools.r8.retrace.RetraceCommand$Builder setStackTrace(java.util.List):103:103 -> a
-    4:4:com.android.tools.r8.retrace.RetraceCommand$Builder setRetracedStackTraceConsumer(java.util.function.Consumer):113:113 -> a
-    5:17:com.android.tools.r8.retrace.RetraceCommand build():118:130 -> a
-    18:18:com.android.tools.r8.retrace.RetraceCommand build():128:128 -> a
-    19:19:com.android.tools.r8.retrace.RetraceCommand build():125:125 -> a
-    20:20:com.android.tools.r8.retrace.RetraceCommand build():122:122 -> a
-    21:21:com.android.tools.r8.retrace.RetraceCommand build():119:119 -> a
+    com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
+    java.util.List stackTrace -> e
+    com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer proguardMapProducer -> c
+    java.util.function.Consumer retracedStackTraceConsumer -> f
+    boolean isVerbose -> a
+    java.lang.String regularExpression -> d
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.RetraceCommand$1):57:57 -> <init>
+    2:3:void <init>(com.android.tools.r8.DiagnosticsHandler):66:67 -> <init>
+    1:1:com.android.tools.r8.retrace.RetraceCommand$Builder setVerbose(boolean):72:72 -> a
+    2:2:com.android.tools.r8.retrace.RetraceCommand$Builder setProguardMapProducer(com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer):82:82 -> a
+    3:3:com.android.tools.r8.retrace.RetraceCommand$Builder setRegularExpression(java.lang.String):93:93 -> a
+    4:4:com.android.tools.r8.retrace.RetraceCommand$Builder setStackTrace(java.util.List):104:104 -> a
+    5:5:com.android.tools.r8.retrace.RetraceCommand$Builder setRetracedStackTraceConsumer(java.util.function.Consumer):114:114 -> a
+    6:23:com.android.tools.r8.retrace.RetraceCommand build():119:136 -> a
+    24:24:com.android.tools.r8.retrace.RetraceCommand build():129:129 -> a
+    25:25:com.android.tools.r8.retrace.RetraceCommand build():126:126 -> a
+    26:26:com.android.tools.r8.retrace.RetraceCommand build():123:123 -> a
+    27:27:com.android.tools.r8.retrace.RetraceCommand build():120:120 -> a
 com.android.tools.r8.retrace.RetraceCommandLineResult -> com.android.tools.r8.retrace.e:
     java.util.List nodes -> a
     1:2:void <init>(java.util.List):13:14 -> <init>
@@ -56525,104 +56754,105 @@
     java.util.List stackTrace -> b
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     com.android.tools.r8.retrace.RetraceBase retraceBase -> a
-    1:4:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler):89:92 -> <init>
-    1:7:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():96:102 -> a
-    8:11:void retraceLine(java.util.List,int,java.util.List):106:109 -> a
-    12:12:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):480:480 -> a
-    12:12:void retraceLine(java.util.List,int,java.util.List):109 -> a
-    13:33:com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine.tryParse(java.lang.String):194:214 -> a
-    13:33:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):484 -> a
-    13:33:void retraceLine(java.util.List,int,java.util.List):109 -> a
-    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine com.android.tools.r8.retrace.RetraceStackTrace$MoreLine.tryParse(java.lang.String):429:439 -> a
-    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):488 -> a
-    34:44:void retraceLine(java.util.List,int,java.util.List):109 -> a
-    45:46:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):490:491 -> a
-    45:46:void retraceLine(java.util.List,int,java.util.List):109 -> a
-    47:50:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):490:493 -> a
-    47:50:void retraceLine(java.util.List,int,java.util.List):109 -> a
-    51:54:void retraceLine(java.util.List,int,java.util.List):110:113 -> a
-    55:56:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):476:477 -> a
-    55:56:void retraceLine(java.util.List,int,java.util.List):109 -> a
+    boolean verbose -> d
+    1:5:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler,boolean):98:102 -> <init>
+    1:7:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():106:112 -> a
+    8:11:void retraceLine(java.util.List,int,java.util.List):116:119 -> a
+    12:12:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):485:485 -> a
+    12:12:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    13:33:com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine.tryParse(java.lang.String):204:224 -> a
+    13:33:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):489 -> a
+    13:33:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine com.android.tools.r8.retrace.RetraceStackTrace$MoreLine.tryParse(java.lang.String):434:444 -> a
+    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):493 -> a
+    34:44:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    45:46:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):495:496 -> a
+    45:46:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    47:50:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):495:498 -> a
+    47:50:void retraceLine(java.util.List,int,java.util.List):119 -> a
+    51:54:void retraceLine(java.util.List,int,java.util.List):120:123 -> a
+    55:56:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):481:482 -> a
+    55:56:void retraceLine(java.util.List,int,java.util.List):119 -> a
 com.android.tools.r8.retrace.RetraceStackTrace$AtLine -> com.android.tools.r8.retrace.v:
-    int linePosition -> f
+    java.lang.String fileName -> f
+    int linePosition -> g
     java.lang.String startingWhitespace -> a
-    boolean isAmbiguous -> g
+    boolean isAmbiguous -> h
     java.lang.String clazz -> c
     java.lang.String at -> b
-    java.lang.String fileName -> e
+    java.lang.String methodAsString -> e
     java.lang.String method -> d
-    1:8:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean):281:288 -> <init>
+    1:9:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean):293:301 -> <init>
     com.android.tools.r8.retrace.RetraceStackTrace$AtLine asAtLine() -> a
-    1:1:boolean access$000(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> a
-    2:51:com.android.tools.r8.retrace.RetraceStackTrace$AtLine tryParse(java.lang.String):293:342 -> a
-    52:59:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):354:361 -> a
-    60:68:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):363:371 -> a
-    69:69:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):370:370 -> a
-    70:70:boolean hasLinePosition():349:349 -> a
-    70:70:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):372 -> a
-    71:73:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):373:375 -> a
-    74:74:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):364:364 -> a
-    75:81:java.lang.String toString(java.lang.String,java.lang.String):386:392 -> a
-    82:90:java.lang.String com.android.tools.r8.com.google.common.base.Strings.padStart(java.lang.String,int,char):90:98 -> a
-    82:90:java.lang.String toString(java.lang.String,java.lang.String):392 -> a
-    91:104:java.lang.String toString(java.lang.String,java.lang.String):392:405 -> a
-    105:105:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    105:105:java.lang.String com.android.tools.r8.com.google.common.base.Strings.padStart(java.lang.String,int,char):89 -> a
-    105:105:java.lang.String toString(java.lang.String,java.lang.String):392 -> a
+    1:1:boolean access$000(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):271:271 -> a
+    2:51:com.android.tools.r8.retrace.RetraceStackTrace$AtLine tryParse(java.lang.String):306:355 -> a
+    52:58:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):370:376 -> a
+    59:65:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):378:384 -> a
+    66:73:java.lang.String com.android.tools.r8.retrace.RetraceUtils.methodDescriptionFromMethodReference(com.android.tools.r8.references.MethodReference,boolean):14:21 -> a
+    66:73:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):385 -> a
+    74:92:java.lang.String com.android.tools.r8.retrace.RetraceUtils.methodDescriptionFromMethodReference(com.android.tools.r8.references.MethodReference,boolean):18:36 -> a
+    74:92:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):385 -> a
+    93:93:java.lang.String com.android.tools.r8.retrace.RetraceUtils.methodDescriptionFromMethodReference(com.android.tools.r8.references.MethodReference,boolean):15:15 -> a
+    93:93:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):385 -> a
+    94:96:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):385:387 -> a
+    97:97:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):386:386 -> a
+    98:98:boolean hasLinePosition():365:365 -> a
+    98:98:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):388 -> a
+    99:101:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):389:391 -> a
+    102:102:void lambda$retrace$0(java.util.List,boolean,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):379:379 -> a
     boolean isAtLine() -> b
-    1:1:java.lang.String access$100(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> b
-    1:1:java.lang.String access$200(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> c
-    1:1:java.lang.String access$300(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> d
-    1:1:java.lang.String access$400(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> e
-    1:1:int access$500(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> f
-    1:1:java.lang.String toString():382:382 -> toString
+    1:1:java.lang.String access$100(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):271:271 -> b
+    1:1:java.lang.String access$200(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):271:271 -> c
+    1:1:java.lang.String access$300(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):271:271 -> d
+    1:1:int access$400(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):271:271 -> e
+    1:13:java.lang.String toString():398:410 -> toString
 com.android.tools.r8.retrace.RetraceStackTrace$AtStackTraceLineComparator -> com.android.tools.r8.retrace.w:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():60:60 -> <clinit>
-    1:1:void <init>():63:63 -> <init>
-    1:13:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):65:77 -> a
-    14:14:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):75:75 -> a
-    15:15:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):73:73 -> a
-    16:16:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):71:71 -> a
-    17:27:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):69:79 -> a
+    1:1:void <clinit>():65:65 -> <clinit>
+    1:1:void <init>():68:68 -> <init>
+    1:13:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):70:82 -> a
+    14:14:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):80:80 -> a
+    15:15:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):78:78 -> a
+    16:16:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):76:76 -> a
+    17:27:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):74:84 -> a
 com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine -> com.android.tools.r8.retrace.x:
     java.lang.String initialWhiteSpace -> a
     java.lang.String exceptionClass -> c
     java.lang.String description -> b
     java.lang.String message -> d
-    1:5:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String):186:190 -> <init>
-    1:4:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):219:222 -> a
-    5:9:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):224:228 -> a
-    10:10:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):224:224 -> a
-    1:1:java.lang.String toString():235:235 -> toString
+    1:5:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String):196:200 -> <init>
+    1:4:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):229:232 -> a
+    5:9:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):234:238 -> a
+    10:10:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):234:234 -> a
+    1:1:java.lang.String toString():245:245 -> toString
 com.android.tools.r8.retrace.RetraceStackTrace$MoreLine -> com.android.tools.r8.retrace.y:
     java.lang.String line -> a
-    1:2:void <init>(java.lang.String):422:423 -> <init>
-    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):447:447 -> a
-    1:1:java.lang.String toString():452:452 -> toString
+    1:2:void <init>(java.lang.String):427:428 -> <init>
+    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):452:452 -> a
+    1:1:java.lang.String toString():457:457 -> toString
 com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine -> com.android.tools.r8.retrace.z:
-    1:1:void <init>():116:116 -> <init>
+    1:1:void <init>():126:126 -> <init>
     com.android.tools.r8.retrace.RetraceStackTrace$AtLine asAtLine() -> a
-    java.util.List retrace(com.android.tools.r8.retrace.RetraceBase) -> a
-    1:1:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):121:121 -> a
-    2:2:int firstCharFromIndex(java.lang.String,int,char):125:125 -> a
-    3:3:boolean lambda$firstCharFromIndex$0(char,java.lang.Character):125:125 -> a
-    4:9:int firstFromIndex(java.lang.String,int,java.util.function.Predicate):129:134 -> a
+    java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean) -> a
+    1:1:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):131:131 -> a
+    2:2:int firstCharFromIndex(java.lang.String,int,char):135:135 -> a
+    3:3:boolean lambda$firstCharFromIndex$0(char,java.lang.Character):135:135 -> a
+    4:9:int firstFromIndex(java.lang.String,int,java.util.function.Predicate):139:144 -> a
     boolean isAtLine() -> b
 com.android.tools.r8.retrace.RetraceStackTrace$StackTraceNode -> com.android.tools.r8.retrace.A:
     java.util.List lines -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:4:void <init>(java.util.List):26:29 -> <init>
-    1:9:void append(java.util.List):33:41 -> a
-    10:21:void append(java.util.List):40:51 -> a
-    22:27:void append(java.util.List):50:55 -> a
-    28:28:boolean lambda$append$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine):41:41 -> a
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(java.util.List):27:30 -> <init>
+    1:9:void append(java.util.List):34:42 -> a
+    10:25:void append(java.util.List):41:56 -> a
+    26:31:void append(java.util.List):53:58 -> a
+    32:32:boolean lambda$append$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine):42:42 -> a
 com.android.tools.r8.retrace.RetraceStackTrace$UnknownLine -> com.android.tools.r8.retrace.B:
     java.lang.String line -> a
-    1:2:void <init>(java.lang.String):459:460 -> <init>
-    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):465:465 -> a
-    1:1:java.lang.String toString():470:470 -> toString
+    1:2:void <init>(java.lang.String):464:465 -> <init>
+    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase,boolean):470:470 -> a
+    1:1:java.lang.String toString():475:475 -> toString
 com.android.tools.r8.retrace.RetraceTypeResult -> com.android.tools.r8.retrace.E:
     com.android.tools.r8.retrace.RetraceBase retraceBase -> b
     com.android.tools.r8.references.TypeReference obfuscatedType -> a
@@ -56719,90 +56949,90 @@
     1:45:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312:356 -> stripAttributes
     46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):324:333 -> stripAttributes
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.AppInfoWithLiveness:
-    1:1:void <clinit>():58:58 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):221:221 -> <init>
-    2:185:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:258 -> <init>
-    186:186:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):300:300 -> <init>
-    187:449:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:337 -> <init>
-    450:489:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):341:380 -> <init>
-    490:528:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):388:426 -> <init>
-    529:573:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):388:432 -> <init>
-    574:574:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):437:437 -> <init>
-    575:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):75:485 -> <init>
-    986:1004:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:499 -> <init>
-    1005:1021:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):495:511 -> <init>
-    1022:1029:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):507:514 -> <init>
-    1030:1030:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):521:521 -> <init>
-    1031:1515:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):75:559 -> <init>
-    1:8:void lambda$withStaticFieldWrites$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField,java.util.Set):639:646 -> a
-    9:14:void lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):660:665 -> a
-    15:15:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):830:830 -> a
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1330:1332 -> addEnumValueInfoMaps
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1323:1325 -> addSwitchMaps
-    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):694:705 -> assertNoItemRemoved
-    1:15:boolean canVirtualMethodBeImplementedInExtraSubclass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):878:892 -> canVirtualMethodBeImplementedInExtraSubclass
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):583:615 -> computeReachableInterfaces
-    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):673:675 -> filter
-    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):673:673 -> filter
-    1:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1130:1173 -> findSingleTargetFromSubtypes
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):679:680 -> getEnumValueInfoMapFor
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():690:690 -> getFieldAccessInfoCollection
-    1:2:java.util.Set getPinnedItems():921:922 -> getPinnedItems
-    1:2:java.util.Set getPrunedTypes():953:954 -> getPrunedTypes
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):684:685 -> getSwitchMapFor
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexProgramClass):839:840 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasLiveness():845:845 -> hasLiveness
-    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):861:865 -> hasPinnedInstanceInitializer
-    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1189:1198 -> interfacesMayHaveDefaultFor
-    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):784:790 -> isFieldOnlyWrittenInMethod
-    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):746:756 -> isFieldRead
-    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):760:761 -> isFieldWritten
-    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):765:776 -> isFieldWrittenByFieldPutInstruction
-    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):711:715 -> isInstantiatedDirectly
-    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):741:742 -> isInstantiatedDirectlyOrIndirectly
-    1:19:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):719:737 -> isInstantiatedIndirectly
-    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):999:1002 -> isInvalidSingleVirtualTarget
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):809:810 -> isLibraryOrClasspathField
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):563:563 -> isLiveProgramClass
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):567:568 -> isLiveProgramType
-    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):627:627 -> isLockCandidate
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):572:579 -> isNonProgramTypeOrLiveProgramType
-    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):856:857 -> isPinned
-    1:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):796:800 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):220:220 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:257 -> <init>
+    186:186:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):299:299 -> <init>
+    187:449:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,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,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:336 -> <init>
+    450:489:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):340:379 -> <init>
+    490:528:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):387:425 -> <init>
+    529:573:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):387:431 -> <init>
+    574:574:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):436:436 -> <init>
+    575:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:484 -> <init>
+    986:1004:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):480:498 -> <init>
+    1005:1021:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):494:510 -> <init>
+    1022:1029:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):506:513 -> <init>
+    1030:1030:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):520:520 -> <init>
+    1031:1515:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:558 -> <init>
+    1:8:void lambda$withStaticFieldWrites$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField,java.util.Set):638:645 -> a
+    9:14:void lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):659:664 -> a
+    15:15:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):829:829 -> a
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1327:1329 -> addEnumValueInfoMaps
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1320:1322 -> addSwitchMaps
+    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):693:704 -> assertNoItemRemoved
+    1:15:boolean canVirtualMethodBeImplementedInExtraSubclass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):877:891 -> canVirtualMethodBeImplementedInExtraSubclass
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):582:614 -> computeReachableInterfaces
+    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):672:674 -> filter
+    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):672:672 -> filter
+    1:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1128:1171 -> findSingleTargetFromSubtypes
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):678:679 -> getEnumValueInfoMapFor
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():689:689 -> getFieldAccessInfoCollection
+    1:2:java.util.Set getPinnedItems():920:921 -> getPinnedItems
+    1:2:java.util.Set getPrunedTypes():952:953 -> getPrunedTypes
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):683:684 -> getSwitchMapFor
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexProgramClass):838:839 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasLiveness():844:844 -> hasLiveness
+    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):860:864 -> hasPinnedInstanceInitializer
+    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1187:1196 -> interfacesMayHaveDefaultFor
+    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):783:789 -> isFieldOnlyWrittenInMethod
+    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):745:755 -> isFieldRead
+    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):759:760 -> isFieldWritten
+    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):764:775 -> isFieldWrittenByFieldPutInstruction
+    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):710:714 -> isInstantiatedDirectly
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):740:741 -> isInstantiatedDirectlyOrIndirectly
+    1:19:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):718:736 -> isInstantiatedIndirectly
+    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):998:1001 -> isInvalidSingleVirtualTarget
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):808:809 -> isLibraryOrClasspathField
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):562:562 -> isLiveProgramClass
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):566:567 -> isLiveProgramType
+    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):626:626 -> isLockCandidate
+    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):571:578 -> isNonProgramTypeOrLiveProgramType
+    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):855:856 -> isPinned
+    1:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):795:799 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    1:2:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):901 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    3:14:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):902:913 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1206:1207 -> lookupSingleInterfaceTarget
-    3:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1215:1232 -> lookupSingleInterfaceTarget
-    21:73:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1231:1283 -> lookupSingleInterfaceTarget
-    74:74:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> lookupSingleInterfaceTarget
-    74:74:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1283 -> lookupSingleInterfaceTarget
-    75:110:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1284:1319 -> lookupSingleInterfaceTarget
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):959:974 -> lookupSingleTarget
-    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):972:972 -> lookupSingleTarget
-    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):970:970 -> lookupSingleTarget
-    19:19:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):968:968 -> lookupSingleTarget
-    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):966:966 -> lookupSingleTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1007:1008 -> lookupSingleVirtualTarget
-    3:35:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1016:1048 -> lookupSingleVirtualTarget
-    36:92:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1047:1103 -> lookupSingleVirtualTarget
-    93:99:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1099:1105 -> lookupSingleVirtualTarget
-    100:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1098:1107 -> lookupSingleVirtualTarget
-    110:110:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1085:1085 -> lookupSingleVirtualTarget
-    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):804:805 -> mayPropagateValueFor
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):933:934 -> prunedCopyFrom
-    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):815:819 -> rewriteItems
-    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):825:834 -> rewriteKeysConservativelyWhileMergingValues
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):939:940 -> rewrittenWithLense
-    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):982:990 -> validateSingleVirtualTarget
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):948:949 -> wasPruned
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():851:851 -> withLiveness
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withStaticFieldWrites(java.util.Map):632:637 -> withStaticFieldWrites
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):653:658 -> withoutStaticFieldsWrites
+    1:2:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):900 -> isVirtualMethodPinnedDirectlyOrInAncestor
+    3:14:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):901:912 -> isVirtualMethodPinnedDirectlyOrInAncestor
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1204:1205 -> lookupSingleInterfaceTarget
+    3:19:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1213:1229 -> lookupSingleInterfaceTarget
+    20:72:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1228:1280 -> lookupSingleInterfaceTarget
+    73:73:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> lookupSingleInterfaceTarget
+    73:73:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1280 -> lookupSingleInterfaceTarget
+    74:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1281:1316 -> lookupSingleInterfaceTarget
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):958:973 -> lookupSingleTarget
+    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):971:971 -> lookupSingleTarget
+    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):969:969 -> lookupSingleTarget
+    19:19:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):967:967 -> lookupSingleTarget
+    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):965:965 -> lookupSingleTarget
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1006:1007 -> lookupSingleVirtualTarget
+    3:34:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1015:1046 -> lookupSingleVirtualTarget
+    35:91:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1045:1101 -> lookupSingleVirtualTarget
+    92:98:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1097:1103 -> lookupSingleVirtualTarget
+    99:108:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1096:1105 -> lookupSingleVirtualTarget
+    109:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1083:1083 -> lookupSingleVirtualTarget
+    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):803:804 -> mayPropagateValueFor
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):932:933 -> prunedCopyFrom
+    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):814:818 -> rewriteItems
+    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):824:833 -> rewriteKeysConservativelyWhileMergingValues
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):938:939 -> rewrittenWithLense
+    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):981:989 -> validateSingleVirtualTarget
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):947:948 -> wasPruned
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():850:850 -> withLiveness
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withStaticFieldWrites(java.util.Map):631:636 -> withStaticFieldWrites
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):652:657 -> withoutStaticFieldsWrites
 com.android.tools.r8.shaking.AppInfoWithLiveness$1 -> com.android.tools.r8.shaking.AppInfoWithLiveness$1:
-    1:1:void <clinit>():964:964 -> <clinit>
+    1:1:void <clinit>():963:963 -> <clinit>
 com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):173:175 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):172:174 -> <init>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.ClassInlineRule:
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,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,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):73:87 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():91:91 -> builder
@@ -56863,23 +57093,25 @@
     2:4:com.android.tools.r8.shaking.ConstantArgumentRule build():26:28 -> build
     1:1:com.android.tools.r8.shaking.ProguardClassSpecification$Builder self():12:12 -> self
 com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry:
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer):28:32 -> <init>
-    1:2:void registerCallSite(com.android.tools.r8.graph.DexCallSite):108:109 -> registerCallSite
-    1:1:boolean registerCheckCast(com.android.tools.r8.graph.DexType):92:92 -> registerCheckCast
-    1:1:boolean registerConstClass(com.android.tools.r8.graph.DexType):87:87 -> registerConstClass
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):67:67 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):62:62 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):42:42 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):52:52 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):47:47 -> registerInvokeStatic
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):57:57 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):37:37 -> registerInvokeVirtual
-    1:2:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):102:103 -> registerMethodHandle
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):72:72 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):77:77 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):82:82 -> registerStaticFieldWrite
-    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):97:97 -> registerTypeReference
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer):25:27 -> <init>
+    1:1:com.android.tools.r8.graph.ProgramMethod getContext():31:31 -> getContext
+    1:1:com.android.tools.r8.graph.DexProgramClass getContextHolder():35:35 -> getContextHolder
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContextMethod():39:39 -> getContextMethod
+    1:2:void registerCallSite(com.android.tools.r8.graph.DexCallSite):115:116 -> registerCallSite
+    1:1:boolean registerCheckCast(com.android.tools.r8.graph.DexType):99:99 -> registerCheckCast
+    1:1:boolean registerConstClass(com.android.tools.r8.graph.DexType):94:94 -> registerConstClass
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):74:74 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):69:69 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):49:49 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):59:59 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):54:54 -> registerInvokeStatic
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):64:64 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):44:44 -> registerInvokeVirtual
+    1:2:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):109:110 -> registerMethodHandle
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):79:79 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):84:84 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):89:89 -> registerStaticFieldWrite
+    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):104:104 -> registerTypeReference
 com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.shaking.DefaultTreePrunerConfiguration:
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -56902,455 +57134,448 @@
     1:3:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> checkItem
     1:6:java.util.List run():26:31 -> run
 com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.Enqueuer:
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):302:302 -> <init>
-    2:193:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):139:330 -> <init>
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):303:303 -> <init>
+    2:193:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):140:331 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$28(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1825 -> a
-    boolean lambda$markVirtualMethodAsReachable$32(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
+    1:1:void lambda$markInstanceFieldAsLive$28(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1827 -> a
     void lambda$newSetWithoutReasonReporter$2(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):344:344 -> a
-    3:8:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):390:395 -> a
+    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):345:345 -> a
+    3:8:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):391:396 -> a
     9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
-    9:9:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):395 -> a
-    10:16:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):397:403 -> a
-    17:17:java.util.Set lambda$registerMethodWithTargetAndContext$4(com.android.tools.r8.graph.DexMethod):538:538 -> a
-    18:18:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):749:749 -> a
-    19:19:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):766:766 -> a
-    20:20:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):767:767 -> a
-    21:21:void lambda$traceNewInstance$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):905:905 -> a
-    22:22:java.lang.Boolean lambda$traceStaticFieldRead$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1032:1032 -> a
-    23:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1097:1097 -> a
-    24:24:boolean lambda$markTypeAsLive$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1237:1237 -> a
-    25:25:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$18(com.android.tools.r8.graph.DexType):1249:1249 -> a
-    26:26:void lambda$processNewlyInstantiatedClass$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1509:1509 -> a
-    27:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$29(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1936:1936 -> a
-    28:28:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$31(com.android.tools.r8.graph.DexProgramClass):1957:1957 -> a
-    29:32:void lambda$markFailedResolutionTargets$34(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2135:2138 -> a
-    33:33:java.util.Set lambda$markSuperMethodAsReachable$35(com.android.tools.r8.graph.DexEncodedMethod):2196:2196 -> a
-    34:34:void lambda$createAppInfo$36(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2259:2259 -> a
-    35:35:boolean lambda$createAppInfo$37(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2264:2264 -> a
-    36:36:java.util.Set lambda$trace$38(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2362:2362 -> a
-    37:37:void lambda$trace$39(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2395:2395 -> a
-    38:38:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexReference,java.util.Map):2441:2441 -> a
-    39:39:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2446:2446 -> a
+    9:9:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):396 -> a
+    10:16:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):398:404 -> a
+    17:17:java.util.Set lambda$registerMethodWithTargetAndContext$4(com.android.tools.r8.graph.DexMethod):539:539 -> a
+    18:18:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):750:750 -> a
+    19:19:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):767:767 -> a
+    20:20:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):768:768 -> a
+    21:21:void lambda$traceNewInstance$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):908:908 -> a
+    22:22:java.lang.Boolean lambda$traceStaticFieldRead$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1034:1034 -> a
+    23:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1099:1099 -> a
+    24:24:boolean lambda$markTypeAsLive$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1239:1239 -> a
+    25:25:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$18(com.android.tools.r8.graph.DexType):1251:1251 -> a
+    26:26:void lambda$processNewlyInstantiatedClass$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1511:1511 -> a
+    27:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$29(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1938:1938 -> a
+    28:28:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$31(com.android.tools.r8.graph.DexProgramClass):1959:1959 -> a
+    29:32:void lambda$markFailedResolutionTargets$33(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2134:2137 -> a
+    33:33:java.util.Set lambda$markSuperMethodAsReachable$34(com.android.tools.r8.graph.DexEncodedMethod):2195:2195 -> a
+    34:34:void lambda$createAppInfo$35(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2258:2258 -> a
+    35:35:boolean lambda$createAppInfo$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2263:2263 -> a
+    36:36:java.util.Set lambda$trace$37(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2361:2361 -> a
+    37:37:void lambda$trace$38(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2394:2394 -> a
+    38:38:void lambda$addConsequentRootSet$39(com.android.tools.r8.graph.DexReference,java.util.Map):2440:2440 -> a
+    39:39:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2445:2445 -> a
     40:40:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    40:40:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2446 -> a
-    41:41:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2447:2447 -> a
+    40:40:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2445 -> a
+    41:41:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2446:2446 -> a
     42:42:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    42:42:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2447 -> a
-    43:43:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2448:2448 -> a
+    42:42:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2446 -> a
+    43:43:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2447:2447 -> a
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    44:44:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2447 -> a
-    45:45:void lambda$markMethodAsLive$42(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2619:2619 -> a
-    46:46:void lambda$markMethodAsLive$43(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2626:2626 -> a
-    1:1:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):111:111 -> access$1000
-    1:1:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):111:111 -> access$1100
-    1:1:void access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):111:111 -> access$1200
-    1:1:void access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):111:111 -> access$1300
-    1:1:void access$500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):111:111 -> access$500
-    1:1:com.android.tools.r8.graph.AppView access$600(com.android.tools.r8.shaking.Enqueuer):111:111 -> access$600
-    1:1:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):111:111 -> access$700
-    1:1:com.android.tools.r8.utils.InternalOptions access$800(com.android.tools.r8.shaking.Enqueuer):111:111 -> access$800
-    1:1:com.android.tools.r8.graph.DexProgramClass access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):111:111 -> access$900
-    1:8:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):2437:2444 -> addConsequentRootSet
+    44:44:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexType,java.util.Set):2446 -> a
+    45:45:void lambda$markMethodAsLive$41(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2616:2616 -> a
+    46:46:void lambda$markMethodAsLive$42(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2623:2623 -> a
+    1:1:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1000
+    1:1:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1100
+    1:1:void access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1200
+    1:1:void access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):112:112 -> access$1300
+    1:1:void access$500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):112:112 -> access$500
+    1:1:com.android.tools.r8.graph.AppView access$600(com.android.tools.r8.shaking.Enqueuer):112:112 -> access$600
+    1:1:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):112:112 -> access$700
+    1:1:com.android.tools.r8.utils.InternalOptions access$800(com.android.tools.r8.shaking.Enqueuer):112:112 -> access$800
+    1:1:com.android.tools.r8.graph.DexProgramClass access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):112:112 -> access$900
+    1:8:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):2436:2443 -> addConsequentRootSet
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$27(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1807 -> b
-    2:2:java.lang.Boolean lambda$traceStaticFieldWrite$10(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1077:1077 -> b
-    3:3:void lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1238:1238 -> b
-    4:4:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$19(com.android.tools.r8.graph.DexProgramClass):1284:1284 -> b
-    5:5:java.util.Set lambda$handleAnnotation$20(com.android.tools.r8.graph.DexType):1314:1314 -> b
-    6:6:void lambda$markMethodAsTargeted$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1483:1483 -> b
-    7:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1768:1768 -> b
-    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$30(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1938:1938 -> b
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$12(com.android.tools.r8.graph.DexType):1151:1151 -> c
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$24(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1769:1769 -> c
-    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$25(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1776:1776 -> c
-    4:4:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$33(com.android.tools.r8.graph.DexProgramClass):2049:2049 -> c
-    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.DexEncodedMethod):1097:1097 -> classReferencedFromReporter
-    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):522:525 -> compatEnqueueHolderIfDependentNonStaticMember
-    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2454:2458 -> computeDelayedInterfaceMethodSyntheticBridges
-    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2457:2461 -> computeDelayedInterfaceMethodSyntheticBridges
-    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2257:2272 -> createAppInfo
-    17:56:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2271:2310 -> createAppInfo
-    57:60:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2309:2312 -> createAppInfo
-    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():342:346 -> createUseRegistryFactory
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$13(com.android.tools.r8.graph.DexType):1170:1170 -> d
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$26(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1778:1778 -> d
-    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2639:2639 -> d
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$14(com.android.tools.r8.graph.DexType):1177:1177 -> e
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$46(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2643:2643 -> e
-    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1292:1292 -> enqueueDependentItem
-    1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):494:504 -> enqueueFirstNonSerializableClassInitializer
+    1:1:void lambda$markStaticFieldAsLive$27(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1809 -> b
+    2:2:java.lang.Boolean lambda$traceStaticFieldWrite$10(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1079:1079 -> b
+    3:3:void lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1240:1240 -> b
+    4:4:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$19(com.android.tools.r8.graph.DexProgramClass):1286:1286 -> b
+    5:5:java.util.Set lambda$handleAnnotation$20(com.android.tools.r8.graph.DexType):1316:1316 -> b
+    6:6:void lambda$markMethodAsTargeted$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1485:1485 -> b
+    7:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1770:1770 -> b
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$30(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1940:1940 -> b
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$12(com.android.tools.r8.graph.DexType):1153:1153 -> c
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$24(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1771:1771 -> c
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$25(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1778:1778 -> c
+    4:4:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$32(com.android.tools.r8.graph.DexProgramClass):2048:2048 -> c
+    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.DexEncodedMethod):1099:1099 -> classReferencedFromReporter
+    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):523:526 -> compatEnqueueHolderIfDependentNonStaticMember
+    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2453:2457 -> computeDelayedInterfaceMethodSyntheticBridges
+    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2456:2460 -> computeDelayedInterfaceMethodSyntheticBridges
+    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2256:2271 -> createAppInfo
+    17:56:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2270:2309 -> createAppInfo
+    57:60:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2308:2311 -> createAppInfo
+    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():343:347 -> createUseRegistryFactory
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$13(com.android.tools.r8.graph.DexType):1172:1172 -> d
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$26(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1780:1780 -> d
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2636:2636 -> d
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$14(com.android.tools.r8.graph.DexType):1179:1179 -> e
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2640:2640 -> e
+    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1294:1294 -> enqueueDependentItem
+    1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):495:505 -> enqueueFirstNonSerializableClassInitializer
     12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> enqueueFirstNonSerializableClassInitializer
-    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):505 -> enqueueFirstNonSerializableClassInitializer
-    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):505:505 -> enqueueFirstNonSerializableClassInitializer
-    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):512:514 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueRootItem(java.util.Map$Entry):423:423 -> enqueueRootItem
+    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):506 -> enqueueFirstNonSerializableClassInitializer
+    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):506:506 -> enqueueFirstNonSerializableClassInitializer
+    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):513:515 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueRootItem(java.util.Map$Entry):424:424 -> enqueueRootItem
     2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):176:176 -> enqueueRootItem
-    2:2:void enqueueRootItem(java.util.Map$Entry):423 -> enqueueRootItem
-    3:3:void enqueueRootItem(java.util.Map$Entry):425:425 -> enqueueRootItem
-    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):433:433 -> enqueueRootItem
-    1:1:void enqueueRootItems(java.util.Map):419:419 -> enqueueRootItems
-    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1426:1438 -> ensureFromLibraryOrThrow
+    2:2:void enqueueRootItem(java.util.Map$Entry):424 -> enqueueRootItem
+    3:3:void enqueueRootItem(java.util.Map$Entry):426:426 -> enqueueRootItem
+    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):434:434 -> enqueueRootItem
+    1:1:void enqueueRootItems(java.util.Map):420:420 -> enqueueRootItems
+    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1428:1440 -> ensureFromLibraryOrThrow
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> ensureFromLibraryOrThrow
-    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1438 -> ensureFromLibraryOrThrow
-    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1439:1450 -> ensureFromLibraryOrThrow
-    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1247:1250 -> ensureMethodsContinueToWidenAccess
-    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1255:1259 -> ensureMethodsContinueToWidenAccess
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$15(com.android.tools.r8.graph.DexType):1200:1200 -> f
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2631:2631 -> f
-    1:4:void finalizeLibraryMethodOverrideInformation():2238:2241 -> finalizeLibraryMethodOverrideInformation
-    1:33:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2095:2127 -> findAndMarkResolutionTarget
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):537:537 -> g
-    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2144:2148 -> generatedEnumValuesMethod
-    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2147:2152 -> generatedEnumValuesMethod
-    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():338:338 -> getGraphReporter
-    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1108:1108 -> getInvokeSuperTarget
+    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1440 -> ensureFromLibraryOrThrow
+    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1441:1452 -> ensureFromLibraryOrThrow
+    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1249:1252 -> ensureMethodsContinueToWidenAccess
+    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1257:1261 -> ensureMethodsContinueToWidenAccess
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$15(com.android.tools.r8.graph.DexType):1202:1202 -> f
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$43(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2628:2628 -> f
+    1:4:void finalizeLibraryMethodOverrideInformation():2237:2240 -> finalizeLibraryMethodOverrideInformation
+    1:33:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2094:2126 -> findAndMarkResolutionTarget
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):538:538 -> g
+    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2143:2147 -> generatedEnumValuesMethod
+    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2146:2151 -> generatedEnumValuesMethod
+    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():339:339 -> getGraphReporter
+    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1110:1110 -> getInvokeSuperTarget
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1108 -> getInvokeSuperTarget
-    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1109:1112 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1110 -> getInvokeSuperTarget
+    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1111:1114 -> getInvokeSuperTarget
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> getInvokeSuperTarget
-    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1112 -> getInvokeSuperTarget
-    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1113:1118 -> getInvokeSuperTarget
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():334:334 -> getMode
-    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):387:410 -> getNonPinnedWrittenFields
-    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):406:406 -> getNonPinnedWrittenFields
-    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):363:363 -> getProgramClassOrNull
+    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1114 -> getInvokeSuperTarget
+    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1115:1120 -> getInvokeSuperTarget
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():335:335 -> getMode
+    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):388:411 -> getNonPinnedWrittenFields
+    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):407:407 -> getNonPinnedWrittenFields
+    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):364:364 -> getProgramClassOrNull
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> getProgramClassOrNull
-    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):363 -> getProgramClassOrNull
-    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):365:373 -> getProgramClassOrNull
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():350:350 -> getUseRegistryFactory
-    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1306:1308 -> handleAnnotation
+    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):364 -> getProgramClassOrNull
+    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):366:374 -> getProgramClassOrNull
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():351:351 -> getUseRegistryFactory
+    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1308:1310 -> handleAnnotation
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> handleAnnotation
-    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1308 -> handleAnnotation
-    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1309:1322 -> handleAnnotation
-    1:9:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2466:2474 -> handleInterfaceMethodSyntheticBridgeAction
+    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1310 -> handleAnnotation
+    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1311:1324 -> handleAnnotation
+    1:9:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2465:2473 -> handleInterfaceMethodSyntheticBridgeAction
     10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> handleInterfaceMethodSyntheticBridgeAction
-    10:10:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2474 -> handleInterfaceMethodSyntheticBridgeAction
-    11:21:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2475:2485 -> handleInterfaceMethodSyntheticBridgeAction
-    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1393:1421 -> handleInvokeOfDirectTarget
-    1:15:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1335:1349 -> handleInvokeOfStaticTarget
-    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2778:2785 -> handleJavaLangClassNewInstance
-    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2784:2792 -> handleJavaLangClassNewInstance
+    10:10:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2473 -> handleInterfaceMethodSyntheticBridgeAction
+    11:21:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2474:2484 -> handleInterfaceMethodSyntheticBridgeAction
+    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1395:1423 -> handleInvokeOfDirectTarget
+    1:15:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1337:1351 -> handleInvokeOfStaticTarget
+    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2777:2784 -> handleJavaLangClassNewInstance
+    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2783:2791 -> handleJavaLangClassNewInstance
     18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> handleJavaLangClassNewInstance
-    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2796 -> handleJavaLangClassNewInstance
-    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2798:2801 -> handleJavaLangClassNewInstance
-    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2953:2958 -> handleJavaLangEnumValueOf
-    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2808:2828 -> handleJavaLangReflectConstructorNewInstance
-    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2827:2853 -> handleJavaLangReflectConstructorNewInstance
+    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2795 -> handleJavaLangClassNewInstance
+    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2797:2800 -> handleJavaLangClassNewInstance
+    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2952:2957 -> handleJavaLangEnumValueOf
+    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2807:2827 -> handleJavaLangReflectConstructorNewInstance
+    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2826:2852 -> handleJavaLangReflectConstructorNewInstance
     49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> handleJavaLangReflectConstructorNewInstance
-    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2855 -> handleJavaLangReflectConstructorNewInstance
-    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2857:2901 -> handleJavaLangReflectConstructorNewInstance
-    1:32:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2911:2942 -> handleJavaLangReflectProxyNewProxyInstance
-    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2673:2679 -> handleReflectiveBehavior
-    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2684:2724 -> handleReflectiveBehavior
-    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> handleReflectiveBehavior
-    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2725 -> handleReflectiveBehavior
-    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2726:2737 -> handleReflectiveBehavior
-    62:62:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> handleReflectiveBehavior
-    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2737 -> handleReflectiveBehavior
-    63:79:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2746:2762 -> handleReflectiveBehavior
-    80:80:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> handleReflectiveBehavior
-    80:80:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2762 -> handleReflectiveBehavior
-    81:86:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2766:2771 -> handleReflectiveBehavior
-    87:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2768:2769 -> handleReflectiveBehavior
-    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2997:3009 -> handleServiceInstantiation
-    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2964:2982 -> handleServiceLoaderInvocation
-    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2975:2991 -> handleServiceLoaderInvocation
-    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):438:445 -> internalEnqueueRootItem
+    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2854 -> handleJavaLangReflectConstructorNewInstance
+    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2856:2900 -> handleJavaLangReflectConstructorNewInstance
+    1:32:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2910:2941 -> handleJavaLangReflectProxyNewProxyInstance
+    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2670:2676 -> handleReflectiveBehavior
+    8:50:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2681:2723 -> handleReflectiveBehavior
+    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> handleReflectiveBehavior
+    51:51:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2724 -> handleReflectiveBehavior
+    52:63:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2725:2736 -> handleReflectiveBehavior
+    64:64:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> handleReflectiveBehavior
+    64:64:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2736 -> handleReflectiveBehavior
+    65:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2745:2761 -> handleReflectiveBehavior
+    82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> handleReflectiveBehavior
+    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2761 -> handleReflectiveBehavior
+    83:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2765:2770 -> handleReflectiveBehavior
+    89:90:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2767:2768 -> handleReflectiveBehavior
+    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2996:3008 -> handleServiceInstantiation
+    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2963:2981 -> handleServiceLoaderInvocation
+    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2974:2990 -> handleServiceLoaderInvocation
+    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):439:446 -> internalEnqueueRootItem
     9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> internalEnqueueRootItem
-    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):446 -> internalEnqueueRootItem
-    10:14:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447:451 -> internalEnqueueRootItem
-    15:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:453 -> internalEnqueueRootItem
+    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447 -> internalEnqueueRootItem
+    10:14:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:452 -> internalEnqueueRootItem
+    15:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):449:454 -> internalEnqueueRootItem
     21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832:832 -> internalEnqueueRootItem
-    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):453 -> internalEnqueueRootItem
-    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):454:465 -> internalEnqueueRootItem
-    34:46:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):462:474 -> internalEnqueueRootItem
-    47:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):471:479 -> internalEnqueueRootItem
-    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):477:477 -> internalEnqueueRootItem
-    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1898:1898 -> isFieldLive
-    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1902:1903 -> isFieldRead
-    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1908:1909 -> isFieldWrittenInMethodSatisfying
-    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1913:1917 -> isFieldWrittenOutsideDefaultConstructor
+    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):454 -> internalEnqueueRootItem
+    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):455:466 -> internalEnqueueRootItem
+    34:46:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):463:475 -> internalEnqueueRootItem
+    47:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):472:480 -> internalEnqueueRootItem
+    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):478:478 -> internalEnqueueRootItem
+    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1900:1900 -> isFieldLive
+    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1904:1905 -> isFieldRead
+    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1910:1911 -> isFieldWrittenInMethodSatisfying
+    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1915:1919 -> isFieldWrittenOutsideDefaultConstructor
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> isFieldWrittenOutsideDefaultConstructor
-    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1917 -> isFieldWrittenOutsideDefaultConstructor
+    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1919 -> isFieldWrittenOutsideDefaultConstructor
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> isFieldWrittenOutsideDefaultConstructor
-    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1918 -> isFieldWrittenOutsideDefaultConstructor
-    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1920:1921 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1920 -> isFieldWrittenOutsideDefaultConstructor
+    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1922:1923 -> isFieldWrittenOutsideDefaultConstructor
     10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> isFieldWrittenOutsideDefaultConstructor
-    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1918 -> isFieldWrittenOutsideDefaultConstructor
-    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1925:1925 -> isInstantiatedOrHasInstantiatedSubtype
-    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):359:359 -> isProgramClass
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2328:2333 -> joinIdentifierNameStrings
-    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2655:2660 -> markClassAsInstantiatedWithCompatRule
+    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1920 -> isFieldWrittenOutsideDefaultConstructor
+    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1927:1927 -> isInstantiatedOrHasInstantiatedSubtype
+    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):360:360 -> isProgramClass
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2327:2332 -> joinIdentifierNameStrings
+    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2652:2657 -> markClassAsInstantiatedWithCompatRule
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> markClassAsInstantiatedWithCompatRule
-    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2661 -> markClassAsInstantiatedWithCompatRule
-    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2662:2664 -> markClassAsInstantiatedWithCompatRule
-    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2662:2662 -> markClassAsInstantiatedWithCompatRule
-    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2647:2649 -> markClassAsInstantiatedWithReason
+    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2658 -> markClassAsInstantiatedWithCompatRule
+    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2659:2661 -> markClassAsInstantiatedWithCompatRule
+    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2659:2659 -> markClassAsInstantiatedWithCompatRule
+    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2644:2646 -> markClassAsInstantiatedWithReason
     4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> markClassAsInstantiatedWithReason
-    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2649 -> markClassAsInstantiatedWithReason
-    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2649:2649 -> markClassAsInstantiatedWithReason
-    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1354:1354 -> markDirectAndIndirectClassInitializersAsLive
+    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2646 -> markClassAsInstantiatedWithReason
+    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2646:2646 -> markClassAsInstantiatedWithReason
+    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1356:1356 -> markDirectAndIndirectClassInitializersAsLive
     2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> markDirectAndIndirectClassInitializersAsLive
-    2:3:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1355 -> markDirectAndIndirectClassInitializersAsLive
-    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1356:1368 -> markDirectAndIndirectClassInitializersAsLive
-    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1376:1382 -> markDirectClassInitializerAsLive
-    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1867:1879 -> markDirectStaticOrConstructorMethodAsLive
+    2:3:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1357 -> markDirectAndIndirectClassInitializersAsLive
+    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1358:1370 -> markDirectAndIndirectClassInitializersAsLive
+    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1378:1384 -> markDirectClassInitializerAsLive
+    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1869:1881 -> markDirectStaticOrConstructorMethodAsLive
     14:14:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markDirectStaticOrConstructorMethodAsLive
-    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1878 -> markDirectStaticOrConstructorMethodAsLive
-    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2156:2162 -> markEnumValuesAsReachable
-    1:2:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2132:2133 -> markFailedResolutionTargets
-    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2534:2538 -> markFieldAsKept
-    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1768:1769 -> markFieldAsTargeted
-    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1811:1816 -> markInstanceFieldAsLive
+    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1880 -> markDirectStaticOrConstructorMethodAsLive
+    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2155:2161 -> markEnumValuesAsReachable
+    1:2:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2131:2132 -> markFailedResolutionTargets
+    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2531:2535 -> markFieldAsKept
+    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1770:1771 -> markFieldAsTargeted
+    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1813:1818 -> markInstanceFieldAsLive
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsLive
-    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1816 -> markInstanceFieldAsLive
-    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1818:1825 -> markInstanceFieldAsLive
-    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1930:1932 -> markInstanceFieldAsReachable
+    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1818 -> markInstanceFieldAsLive
+    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1820:1827 -> markInstanceFieldAsLive
+    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1932:1934 -> markInstanceFieldAsReachable
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsReachable
-    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1932 -> markInstanceFieldAsReachable
-    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1935:1958 -> markInstanceFieldAsReachable
-    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1830:1831 -> markInstantiated
+    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1934 -> markInstanceFieldAsReachable
+    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1937:1960 -> markInstanceFieldAsReachable
+    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1832:1833 -> markInstantiated
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstantiated
-    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1831 -> markInstantiated
-    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1833:1833 -> markInstantiated
-    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):483:489 -> markInterfaceAsInstantiated
-    1:20:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1266:1285 -> markInterfaceTypeAsLiveViaInheritanceClause
-    21:21:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1272:1272 -> markInterfaceTypeAsLiveViaInheritanceClause
-    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1837:1837 -> markLambdaInstantiated
+    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1833 -> markInstantiated
+    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1835:1835 -> markInstantiated
+    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):484:490 -> markInterfaceAsInstantiated
+    1:20:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1268:1287 -> markInterfaceTypeAsLiveViaInheritanceClause
+    21:21:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1274:1274 -> markInterfaceTypeAsLiveViaInheritanceClause
+    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1839:1839 -> markLambdaInstantiated
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> markLambdaInstantiated
-    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1837 -> markLambdaInstantiated
-    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1839:1860 -> markLambdaInstantiated
-    1:25:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1632:1656 -> markLibraryAndClasspathMethodOverridesAsLive
-    1:25:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2498:2522 -> markMethodAsKept
-    26:35:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2519:2528 -> markMethodAsKept
-    1:16:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2589:2604 -> markMethodAsLive
+    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1839 -> markLambdaInstantiated
+    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1841:1862 -> markLambdaInstantiated
+    1:25:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1634:1658 -> markLibraryAndClasspathMethodOverridesAsLive
+    1:23:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2497:2519 -> markMethodAsKept
+    24:33:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2516:2525 -> markMethodAsKept
+    1:16:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2586:2601 -> markMethodAsLive
     17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsLive
-    17:17:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2604 -> markMethodAsLive
-    18:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2606:2610 -> markMethodAsLive
-    23:26:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2609:2612 -> markMethodAsLive
-    27:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2611:2626 -> markMethodAsLive
-    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2669:2669 -> markMethodAsLiveWithCompatRule
-    1:12:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1475:1486 -> markMethodAsTargeted
+    17:17:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2601 -> markMethodAsLive
+    18:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2603:2607 -> markMethodAsLive
+    23:26:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2606:2609 -> markMethodAsLive
+    27:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2608:2623 -> markMethodAsLive
+    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2666:2666 -> markMethodAsLiveWithCompatRule
+    1:12:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1477:1488 -> markMethodAsTargeted
     13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsTargeted
-    13:13:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1486 -> markMethodAsTargeted
-    14:18:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1488:1492 -> markMethodAsTargeted
-    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1389:1389 -> markNonStaticDirectMethodAsReachable
+    13:13:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1488 -> markMethodAsTargeted
+    14:18:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1490:1494 -> markMethodAsTargeted
+    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1391:1391 -> markNonStaticDirectMethodAsReachable
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> markOverridesAsLibraryMethodOverrides
-    1:2:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1674 -> markOverridesAsLibraryMethodOverrides
-    3:17:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1675:1689 -> markOverridesAsLibraryMethodOverrides
-    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2637:2641 -> markParameterAndReturnTypesAsLive
-    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2038:2038 -> markPossibleTargetsAsReachable
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> markPossibleTargetsAsReachable
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> markPossibleTargetsAsReachable
-    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2038 -> markPossibleTargetsAsReachable
-    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2038:2039 -> markPossibleTargetsAsReachable
-    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> markPossibleTargetsAsReachable
-    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2039 -> markPossibleTargetsAsReachable
-    6:52:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2039:2085 -> markPossibleTargetsAsReachable
-    53:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2082:2088 -> markPossibleTargetsAsReachable
-    60:63:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2065:2068 -> markPossibleTargetsAsReachable
-    64:64:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2065:2065 -> markPossibleTargetsAsReachable
-    1:3:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2630:2632 -> markReferencedTypesAsLive
-    1:7:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1661:1667 -> markResolutionAsLive
-    8:8:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1666:1666 -> markResolutionAsLive
-    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1774:1792 -> markStaticFieldAsLive
+    1:2:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1676 -> markOverridesAsLibraryMethodOverrides
+    3:17:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1677:1691 -> markOverridesAsLibraryMethodOverrides
+    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2634:2638 -> markParameterAndReturnTypesAsLive
+    1:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2040:2041 -> markPossibleTargetsAsReachable
+    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> markPossibleTargetsAsReachable
+    3:3:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2041 -> markPossibleTargetsAsReachable
+    4:47:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2041:2084 -> markPossibleTargetsAsReachable
+    48:54:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2081:2087 -> markPossibleTargetsAsReachable
+    55:58:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2064:2067 -> markPossibleTargetsAsReachable
+    59:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,com.android.tools.r8.graph.DexEncodedMethod):2064:2064 -> markPossibleTargetsAsReachable
+    1:3:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2627:2629 -> markReferencedTypesAsLive
+    1:7:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1663:1669 -> markResolutionAsLive
+    8:8:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1668:1668 -> markResolutionAsLive
+    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1776:1794 -> markStaticFieldAsLive
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
-    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1792 -> markStaticFieldAsLive
-    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1795:1796 -> markStaticFieldAsLive
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1794 -> markStaticFieldAsLive
+    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1797:1798 -> markStaticFieldAsLive
     23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
-    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1796 -> markStaticFieldAsLive
-    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1800:1807 -> markStaticFieldAsLive
-    1:9:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2168:2176 -> markSuperMethodAsReachable
-    10:27:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2175:2192 -> markSuperMethodAsReachable
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1798 -> markStaticFieldAsLive
+    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1802:1809 -> markStaticFieldAsLive
+    1:9:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2167:2175 -> markSuperMethodAsReachable
+    10:27:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2174:2191 -> markSuperMethodAsReachable
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
-    28:28:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2192 -> markSuperMethodAsReachable
-    29:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2195:2200 -> markSuperMethodAsReachable
-    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1137:1152 -> markTypeAsLive
-    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1149:1149 -> markTypeAsLive
-    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1156:1171 -> markTypeAsLive
-    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1168:1168 -> markTypeAsLive
-    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1175:1177 -> markTypeAsLive
-    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1175:1175 -> markTypeAsLive
-    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1183:1188 -> markTypeAsLive
+    28:28:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2191 -> markSuperMethodAsReachable
+    29:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2194:2199 -> markSuperMethodAsReachable
+    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1139:1154 -> markTypeAsLive
+    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1151:1151 -> markTypeAsLive
+    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1158:1173 -> markTypeAsLive
+    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1170:1170 -> markTypeAsLive
+    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1177:1179 -> markTypeAsLive
+    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1177:1177 -> markTypeAsLive
+    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185:1190 -> markTypeAsLive
     45:45:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markTypeAsLive
-    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1188 -> markTypeAsLive
-    46:97:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191:1242 -> markTypeAsLive
+    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1190 -> markTypeAsLive
+    46:97:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1193:1244 -> markTypeAsLive
     98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> markTypeAsLive
-    98:98:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1243 -> markTypeAsLive
-    99:99:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1243:1243 -> markTypeAsLive
-    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1242:1242 -> markTypeAsLive
-    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1885:1889 -> markVirtualMethodAsLive
-    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1887:1892 -> markVirtualMethodAsLive
+    98:98:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1245 -> markTypeAsLive
+    99:99:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1245:1245 -> markTypeAsLive
+    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1244:1244 -> markTypeAsLive
+    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1887:1891 -> markVirtualMethodAsLive
+    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1889:1894 -> markVirtualMethodAsLive
     12:12:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsLive
-    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1892 -> markVirtualMethodAsLive
-    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1965:1965 -> markVirtualMethodAsReachable
-    2:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1973:2000 -> markVirtualMethodAsReachable
-    30:30:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
-    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2000 -> markVirtualMethodAsReachable
-    31:46:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2004:2019 -> markVirtualMethodAsReachable
-    47:47:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):77:77 -> markVirtualMethodAsReachable
-    47:47:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2022 -> markVirtualMethodAsReachable
-    48:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2023:2026 -> markVirtualMethodAsReachable
-    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> markVirtualMethodAsReachable
-    52:52:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2027 -> markVirtualMethodAsReachable
-    53:53:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2030:2030 -> markVirtualMethodAsReachable
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():415:415 -> newSetWithoutReasonReporter
-    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1534:1546 -> populateInstantiatedTypesCache
-    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1302:1302 -> processAnnotation
-    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1296:1297 -> processAnnotations
-    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1504:1518 -> processNewlyInstantiatedClass
+    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1894 -> markVirtualMethodAsLive
+    1:28:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1967:1994 -> markVirtualMethodAsReachable
+    29:29:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
+    29:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1994 -> markVirtualMethodAsReachable
+    30:54:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1998:2022 -> markVirtualMethodAsReachable
+    55:55:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):74:74 -> markVirtualMethodAsReachable
+    55:55:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2025 -> markVirtualMethodAsReachable
+    56:59:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2026:2029 -> markVirtualMethodAsReachable
+    60:60:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> markVirtualMethodAsReachable
+    60:60:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2030 -> markVirtualMethodAsReachable
+    61:61:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2033:2033 -> markVirtualMethodAsReachable
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():416:416 -> newSetWithoutReasonReporter
+    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1536:1548 -> populateInstantiatedTypesCache
+    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1304:1304 -> processAnnotation
+    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1298:1299 -> processAnnotations
+    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1506:1520 -> processNewlyInstantiatedClass
     16:16:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> processNewlyInstantiatedClass
-    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1518 -> processNewlyInstantiatedClass
-    17:26:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1521:1530 -> processNewlyInstantiatedClass
-    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):354:354 -> registerAnalysis
-    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):762:768 -> registerDeferredActionForDeadProtoBuilder
-    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):764:764 -> registerDeferredActionForDeadProtoBuilder
-    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):552:553 -> registerFieldAccess
-    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):558:586 -> registerFieldAccess
-    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):544:544 -> registerFieldRead
-    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):548:548 -> registerFieldWrite
-    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):535:538 -> registerMethodWithTargetAndContext
-    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1456:1457 -> reportMissingClass
+    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1520 -> processNewlyInstantiatedClass
+    17:26:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1523:1532 -> processNewlyInstantiatedClass
+    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):355:355 -> registerAnalysis
+    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):763:769 -> registerDeferredActionForDeadProtoBuilder
+    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):765:765 -> registerDeferredActionForDeadProtoBuilder
+    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):553:554 -> registerFieldAccess
+    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):559:587 -> registerFieldAccess
+    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):545:545 -> registerFieldRead
+    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):549:549 -> registerFieldWrite
+    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):536:539 -> registerMethodWithTargetAndContext
+    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1458:1459 -> reportMissingClass
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingClass
-    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1457 -> reportMissingClass
-    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1468:1469 -> reportMissingField
+    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1459 -> reportMissingClass
+    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1470:1471 -> reportMissingField
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingField
-    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1469 -> reportMissingField
-    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1462:1463 -> reportMissingMethod
+    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1471 -> reportMissingField
+    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1464:1465 -> reportMissingMethod
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingMethod
-    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1463 -> reportMissingMethod
-    1:4:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1326:1329 -> resolveMethod
-    1:1:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2544:2544 -> shouldMarkLibraryMethodOverrideAsReachable
+    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1465 -> reportMissingMethod
+    1:4:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1328:1331 -> resolveMethod
+    1:1:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2541:2541 -> shouldMarkLibraryMethodOverrideAsReachable
     2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> shouldMarkLibraryMethodOverrideAsReachable
-    2:2:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2546 -> shouldMarkLibraryMethodOverrideAsReachable
-    3:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2550:2562 -> shouldMarkLibraryMethodOverrideAsReachable
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> shouldMarkLibraryMethodOverrideAsReachable
-    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2562 -> shouldMarkLibraryMethodOverrideAsReachable
-    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2567:2579 -> shouldMarkLibraryMethodOverrideAsReachable
-    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2318:2323 -> toSortedDescriptorSet
-    1:84:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2339:2422 -> trace
-    85:96:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2421:2432 -> trace
-    97:97:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2430:2430 -> trace
-    1:10:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2225:2234 -> traceApplication
-    1:63:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):590:652 -> traceCallSite
-    64:64:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):649:649 -> traceCallSite
-    65:65:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):646:646 -> traceCallSite
-    66:66:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):643:643 -> traceCallSite
-    67:67:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):640:640 -> traceCallSite
-    68:107:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):637:676 -> traceCallSite
+    2:2:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2543 -> shouldMarkLibraryMethodOverrideAsReachable
+    3:19:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2543:2559 -> shouldMarkLibraryMethodOverrideAsReachable
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> shouldMarkLibraryMethodOverrideAsReachable
+    20:20:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559 -> shouldMarkLibraryMethodOverrideAsReachable
+    21:33:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564:2576 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2317:2322 -> toSortedDescriptorSet
+    1:84:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2338:2421 -> trace
+    85:96:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2420:2431 -> trace
+    97:97:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2429:2429 -> trace
+    1:10:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2224:2233 -> traceApplication
+    1:62:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):591:652 -> traceCallSite
+    63:63:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):649:649 -> traceCallSite
+    64:64:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):646:646 -> traceCallSite
+    65:65:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):643:643 -> traceCallSite
+    66:66:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):640:640 -> traceCallSite
+    67:106:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):637:676 -> traceCallSite
     1:1:boolean traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):682:682 -> traceCheckCast
     1:8:boolean traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):688:695 -> traceConstClass
     1:10:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):699:708 -> traceConstClassOrCheckCast
     11:11:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):707:707 -> traceConstClassOrCheckCast
-    1:20:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):932:951 -> traceInstanceFieldRead
+    1:20:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):934:953 -> traceInstanceFieldRead
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldRead
-    21:21:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):951 -> traceInstanceFieldRead
-    22:30:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):956:964 -> traceInstanceFieldRead
-    31:31:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):963:963 -> traceInstanceFieldRead
-    1:20:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):969:988 -> traceInstanceFieldWrite
+    21:21:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):953 -> traceInstanceFieldRead
+    22:30:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):958:966 -> traceInstanceFieldRead
+    31:31:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):965:965 -> traceInstanceFieldRead
+    1:20:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):971:990 -> traceInstanceFieldWrite
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldWrite
-    21:21:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):988 -> traceInstanceFieldWrite
-    22:30:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):993:1001 -> traceInstanceFieldWrite
-    1:13:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):744:756 -> traceInvokeDirect
-    14:14:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> traceInvokeDirect
-    15:19:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):780:784 -> traceInvokeDirect
-    20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeDirect
-    20:20:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):784 -> traceInvokeDirect
-    21:21:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):786:786 -> traceInvokeDirect
-    1:1:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):775:775 -> traceInvokeDirectFromLambda
-    2:2:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):774:774 -> traceInvokeDirectFromLambda
-    1:1:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):793:793 -> traceInvokeInterface
-    2:2:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):792:792 -> traceInvokeInterface
-    3:7:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):803:807 -> traceInvokeInterface
-    8:8:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeInterface
-    8:8:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):807 -> traceInvokeInterface
-    9:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):809:809 -> traceInvokeInterface
-    1:1:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):798:798 -> traceInvokeInterfaceFromLambda
-    2:2:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):797:797 -> traceInvokeInterfaceFromLambda
-    1:1:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):816:816 -> traceInvokeStatic
-    2:2:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):815:815 -> traceInvokeStatic
-    3:26:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):826:849 -> traceInvokeStatic
-    27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeStatic
-    27:27:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):849 -> traceInvokeStatic
-    28:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):851:851 -> traceInvokeStatic
-    1:1:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):821:821 -> traceInvokeStaticFromLambda
-    2:2:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):820:820 -> traceInvokeStaticFromLambda
-    1:6:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):859:864 -> traceInvokeSuper
-    7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeSuper
-    7:7:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):864 -> traceInvokeSuper
-    8:8:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):866:866 -> traceInvokeSuper
-    1:1:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):873:873 -> traceInvokeVirtual
-    2:2:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):872:872 -> traceInvokeVirtual
-    3:10:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):883:890 -> traceInvokeVirtual
-    11:22:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):885:896 -> traceInvokeVirtual
-    23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeVirtual
-    23:23:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):896 -> traceInvokeVirtual
-    24:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):898:898 -> traceInvokeVirtual
-    1:1:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):878:878 -> traceInvokeVirtualFromLambda
-    2:2:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):877:877 -> traceInvokeVirtualFromLambda
-    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2209:2216 -> traceMainDex
+    21:21:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):990 -> traceInstanceFieldWrite
+    22:30:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):995:1003 -> traceInstanceFieldWrite
+    1:15:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):743:757 -> traceInvokeDirect
+    16:16:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):756:756 -> traceInvokeDirect
+    17:22:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):781:786 -> traceInvokeDirect
+    23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeDirect
+    23:23:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):786 -> traceInvokeDirect
+    24:24:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):788:788 -> traceInvokeDirect
+    1:2:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):775:776 -> traceInvokeDirectFromLambda
+    3:3:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):775:775 -> traceInvokeDirectFromLambda
+    1:2:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):793:794 -> traceInvokeInterface
+    3:3:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):793:793 -> traceInvokeInterface
+    4:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):804:809 -> traceInvokeInterface
+    10:10:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeInterface
+    10:10:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):809 -> traceInvokeInterface
+    11:11:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):811:811 -> traceInvokeInterface
+    1:2:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):798:799 -> traceInvokeInterfaceFromLambda
+    3:3:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):798:798 -> traceInvokeInterfaceFromLambda
+    1:2:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):816:817 -> traceInvokeStatic
+    3:3:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):816:816 -> traceInvokeStatic
+    4:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):827:851 -> traceInvokeStatic
+    29:29:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeStatic
+    29:29:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):851 -> traceInvokeStatic
+    30:30:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):853:853 -> traceInvokeStatic
+    1:2:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):821:822 -> traceInvokeStaticFromLambda
+    3:3:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):821:821 -> traceInvokeStaticFromLambda
+    1:10:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):858:867 -> traceInvokeSuper
+    11:11:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeSuper
+    11:11:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):867 -> traceInvokeSuper
+    12:12:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):869:869 -> traceInvokeSuper
+    1:2:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):874:875 -> traceInvokeVirtual
+    3:3:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):874:874 -> traceInvokeVirtual
+    4:11:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):885:892 -> traceInvokeVirtual
+    12:23:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):887:898 -> traceInvokeVirtual
+    24:24:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeVirtual
+    24:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):898 -> traceInvokeVirtual
+    25:25:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):900:900 -> traceInvokeVirtual
+    1:2:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):879:880 -> traceInvokeVirtualFromLambda
+    3:3:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):879:879 -> traceInvokeVirtualFromLambda
+    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2208:2215 -> traceMainDex
     1:1:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> traceMethodHandle
     1:1:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):723 -> traceMethodHandle
     2:10:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):723:731 -> traceMethodHandle
-    1:8:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):903:910 -> traceNewInstance
-    9:14:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):920:925 -> traceNewInstance
-    1:1:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):915:915 -> traceNewInstanceFromLambda
-    2:2:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):914:914 -> traceNewInstanceFromLambda
-    1:19:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1006:1024 -> traceStaticFieldRead
+    1:9:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):905:913 -> traceNewInstance
+    10:16:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):921:927 -> traceNewInstance
+    1:1:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):917:917 -> traceNewInstanceFromLambda
+    1:19:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1008:1026 -> traceStaticFieldRead
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldRead
-    20:20:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1024 -> traceStaticFieldRead
-    21:28:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1027:1034 -> traceStaticFieldRead
-    29:45:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1030:1046 -> traceStaticFieldRead
-    1:19:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1051:1069 -> traceStaticFieldWrite
+    20:20:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1026 -> traceStaticFieldRead
+    21:28:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1029:1036 -> traceStaticFieldRead
+    29:45:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1032:1048 -> traceStaticFieldRead
+    1:19:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1053:1071 -> traceStaticFieldWrite
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldWrite
-    20:20:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1069 -> traceStaticFieldWrite
-    21:28:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1072:1079 -> traceStaticFieldWrite
-    29:45:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1075:1091 -> traceStaticFieldWrite
+    20:20:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1071 -> traceStaticFieldWrite
+    21:28:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1074:1081 -> traceStaticFieldWrite
+    29:45:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1077:1093 -> traceStaticFieldWrite
     1:1:boolean traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):738:738 -> traceTypeReference
-    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1697:1704 -> transitionDefaultMethodsForInstantiatedClass
-    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1745:1748 -> transitionDependentItemsForInstantiatedClass
+    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1699:1706 -> transitionDefaultMethodsForInstantiatedClass
+    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1747:1750 -> transitionDependentItemsForInstantiatedClass
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionDependentItemsForInstantiatedClass
-    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1748 -> transitionDependentItemsForInstantiatedClass
-    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1750:1751 -> transitionDependentItemsForInstantiatedClass
-    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1730:1738 -> transitionFieldsForInstantiatedClass
-    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1567:1588 -> transitionMethodsForInstantiatedClass
+    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1750 -> transitionDependentItemsForInstantiatedClass
+    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1752:1753 -> transitionDependentItemsForInstantiatedClass
+    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1732:1740 -> transitionFieldsForInstantiatedClass
+    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1569:1590 -> transitionMethodsForInstantiatedClass
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionMethodsForInstantiatedClass
-    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1588 -> transitionMethodsForInstantiatedClass
-    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1590:1616 -> transitionMethodsForInstantiatedClass
+    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1590 -> transitionMethodsForInstantiatedClass
+    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1592:1618 -> transitionMethodsForInstantiatedClass
     51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionMethodsForInstantiatedClass
-    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1616 -> transitionMethodsForInstantiatedClass
-    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1618:1622 -> transitionMethodsForInstantiatedClass
+    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1618 -> transitionMethodsForInstantiatedClass
+    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1620:1624 -> transitionMethodsForInstantiatedClass
     57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionMethodsForInstantiatedClass
-    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1622 -> transitionMethodsForInstantiatedClass
-    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1624:1624 -> transitionMethodsForInstantiatedClass
-    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1710:1718 -> transitionNonAbstractMethodsToLiveAndShadow
-    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1717:1717 -> transitionNonAbstractMethodsToLiveAndShadow
-    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1714:1714 -> transitionNonAbstractMethodsToLiveAndShadow
-    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1101:1103 -> transitionReachableVirtualMethods
-    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1755:1763 -> transitionUnusedInterfaceToLive
-    1:5:void unpinLambdaMethods():2489:2493 -> unpinLambdaMethods
-    1:3:boolean verifyKeptGraph():2248:2250 -> verifyKeptGraph
-    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1126:1127 -> verifyMethodIsTargeted
-    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1132:1132 -> verifyTypeIsLive
-    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):378:382 -> warnIfLibraryTypeInheritsFromProgramType
+    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1624 -> transitionMethodsForInstantiatedClass
+    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1626:1626 -> transitionMethodsForInstantiatedClass
+    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1712:1720 -> transitionNonAbstractMethodsToLiveAndShadow
+    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1719:1719 -> transitionNonAbstractMethodsToLiveAndShadow
+    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1716:1716 -> transitionNonAbstractMethodsToLiveAndShadow
+    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1103:1105 -> transitionReachableVirtualMethods
+    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1757:1765 -> transitionUnusedInterfaceToLive
+    1:5:void unpinLambdaMethods():2488:2492 -> unpinLambdaMethods
+    1:3:boolean verifyKeptGraph():2247:2249 -> verifyKeptGraph
+    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1128:1129 -> verifyMethodIsTargeted
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1134:1134 -> verifyTypeIsLive
+    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):379:383 -> warnIfLibraryTypeInheritsFromProgramType
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
     1:1:void <clinit>():635:635 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker:
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3188:3188 -> <init>
-    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):3195:3198 -> <init>
-    1:1:boolean addField(com.android.tools.r8.graph.DexField):3208:3208 -> addField
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3187:3187 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):3194:3197 -> <init>
+    1:1:boolean addField(com.android.tools.r8.graph.DexField):3207:3207 -> addField
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> addField
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):3208 -> addField
-    3:13:boolean addField(com.android.tools.r8.graph.DexField):3212:3222 -> addField
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):3207 -> addField
+    3:13:boolean addField(com.android.tools.r8.graph.DexField):3211:3221 -> addField
     14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> addField
-    14:14:boolean addField(com.android.tools.r8.graph.DexField):3222 -> addField
-    15:27:boolean addField(com.android.tools.r8.graph.DexField):3222:3234 -> addField
-    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3242:3251 -> addMethod
-    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3250:3257 -> addMethod
-    1:2:boolean addType(com.android.tools.r8.graph.DexType):3287:3288 -> addType
+    14:14:boolean addField(com.android.tools.r8.graph.DexField):3221 -> addField
+    15:27:boolean addField(com.android.tools.r8.graph.DexField):3221:3233 -> addField
+    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3241:3250 -> addMethod
+    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3249:3256 -> addMethod
+    1:2:boolean addType(com.android.tools.r8.graph.DexType):3286:3287 -> addType
     1:1:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedDescriptor(com.android.tools.r8.graph.DexType):111:111 -> getRenamedDescriptor
     1:1:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):0 -> getRenamedDescriptor
     1:1:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedName(com.android.tools.r8.graph.DexMethod):103:103 -> getRenamedName
@@ -57358,58 +57583,58 @@
     2:2:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedName(com.android.tools.r8.graph.DexField):107:107 -> getRenamedName
     2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):0 -> getRenamedName
 com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet:
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3051:3051 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3047:3052 -> <init>
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3045:3045 -> access$400
-    1:3:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3056:3058 -> add
-    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3062:3062 -> contains
-    1:1:java.util.Set getItems():3066:3066 -> getItems
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3050:3050 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3046:3051 -> <init>
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3044:3044 -> access$400
+    1:3:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3055:3057 -> add
+    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3061:3061 -> contains
+    1:1:java.util.Set getItems():3065:3065 -> getItems
 com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget:
-    1:3:void <clinit>():3094:3096 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):3105:3108 -> <init>
-    1:2:boolean equals(java.lang.Object):3124:3125 -> equals
-    1:1:int hashCode():3118:3118 -> hashCode
-    1:1:boolean isUnresolved():3112:3112 -> isUnresolved
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():3102:3102 -> unresolved
+    1:3:void <clinit>():3093:3095 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):3104:3107 -> <init>
+    1:2:boolean equals(java.lang.Object):3123:3124 -> equals
+    1:1:int hashCode():3117:3117 -> hashCode
+    1:1:boolean isUnresolved():3111:3111 -> isUnresolved
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():3101:3101 -> unresolved
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.Enqueuer$Mode:
-    1:4:void <clinit>():114:117 -> <clinit>
-    5:5:void <clinit>():113:113 -> <clinit>
-    1:1:void <init>(java.lang.String,int):113:113 -> <init>
-    1:1:boolean isFinalTreeShaking():124:124 -> isFinalTreeShaking
-    1:1:boolean isInitialOrFinalTreeShaking():128:128 -> isInitialOrFinalTreeShaking
-    1:1:boolean isInitialTreeShaking():120:120 -> isInitialTreeShaking
-    1:1:boolean isTracingMainDex():132:132 -> isTracingMainDex
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):113:113 -> valueOf
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():113:113 -> values
+    1:4:void <clinit>():115:118 -> <clinit>
+    5:5:void <clinit>():114:114 -> <clinit>
+    1:1:void <init>(java.lang.String,int):114:114 -> <init>
+    1:1:boolean isFinalTreeShaking():125:125 -> isFinalTreeShaking
+    1:1:boolean isInitialOrFinalTreeShaking():129:129 -> isInitialOrFinalTreeShaking
+    1:1:boolean isInitialTreeShaking():121:121 -> isInitialTreeShaking
+    1:1:boolean isTracingMainDex():133:133 -> isTracingMainDex
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):114:114 -> valueOf
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():114:114 -> values
 com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet:
-    1:4:void <init>():3129:3132 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3129:3129 -> <init>
-    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3143:3150 -> add
-    1:1:java.util.Set getMethods():3135:3135 -> getMethods
-    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3139:3139 -> getReasons
+    1:4:void <init>():3128:3131 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3128:3128 -> <init>
+    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3142:3149 -> add
+    1:1:java.util.Set getMethods():3134:3134 -> getMethods
+    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3138:3138 -> getReasons
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReason:
-    1:1:void <init>(java.util.function.BiConsumer):3076:3076 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):3072:3077 -> <init>
-    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReason):3070:3070 -> access$200
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3081:3082 -> add
-    1:1:boolean contains(java.lang.Object):3086:3086 -> contains
-    1:1:java.util.Set getItems():3090:3090 -> getItems
+    1:1:void <init>(java.util.function.BiConsumer):3075:3075 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):3071:3076 -> <init>
+    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReason):3069:3069 -> access$200
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3080:3081 -> add
+    1:1:boolean contains(java.lang.Object):3085:3085 -> contains
+    1:1:java.util.Set getItems():3089:3089 -> getItems
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason:
-    1:1:void <clinit>():3014:3014 -> <clinit>
-    1:4:void <init>():3014:3017 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3014:3014 -> <init>
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3034:3034 -> a
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3014:3014 -> access$300
-    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3020:3022 -> add
-    1:1:boolean contains(java.lang.Object):3029:3029 -> contains
-    1:1:java.util.Set getItems():3041:3041 -> getItems
-    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3033:3034 -> registerDeferredAction
+    1:1:void <clinit>():3013:3013 -> <clinit>
+    1:4:void <init>():3013:3016 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3013:3013 -> <init>
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3033:3033 -> a
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3013:3013 -> access$300
+    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3019:3021 -> add
+    1:1:boolean contains(java.lang.Object):3028:3028 -> contains
+    1:1:java.util.Set getItems():3040:3040 -> getItems
+    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3032:3033 -> registerDeferredAction
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> com.android.tools.r8.shaking.Enqueuer$TargetWithContext:
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):3160:3162 -> <init>
-    1:5:boolean equals(java.lang.Object):3180:3184 -> equals
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():3170:3170 -> getContext
-    1:1:com.android.tools.r8.graph.Descriptor getTarget():3166:3166 -> getTarget
-    1:1:int hashCode():3175:3175 -> hashCode
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):3159:3161 -> <init>
+    1:5:boolean equals(java.lang.Object):3179:3183 -> equals
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():3169:3169 -> getContext
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():3165:3165 -> getTarget
+    1:1:int hashCode():3174:3174 -> hashCode
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.EnqueuerFactory:
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> createForFinalTreeShaking
@@ -57421,66 +57646,58 @@
     1:1:void <init>():11:11 -> <init>
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> toImmutableSortedMap
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.EnqueuerWorklist:
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):234:234 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):232:235 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):239:239 -> createWorklist
-    1:2:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):294:295 -> enqueueMarkFieldKeptAction
-    1:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):276:277 -> enqueueMarkInstantiatedAction
-    1:2:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):288:289 -> enqueueMarkMethodKeptAction
-    1:2:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):282:283 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):251:251 -> enqueueMarkReachableDirectAction
-    1:2:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):268:269 -> enqueueMarkReachableFieldAction
-    1:1:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):259:259 -> enqueueMarkReachableInterfaceAction
-    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):263:263 -> enqueueMarkReachableSuperAction
-    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):255:255 -> enqueueMarkReachableVirtualAction
-    1:2:void enqueueTraceConstClassAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):299:300 -> enqueueTraceConstClassAction
-    1:2:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):305:306 -> enqueueTraceInvokeDirectAction
-    1:2:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):310:311 -> enqueueTraceNewInstanceAction
-    1:2:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):315:316 -> enqueueTraceStaticFieldRead
-    1:1:boolean isEmpty():243:243 -> isEmpty
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():247:247 -> poll
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):205:205 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):203:206 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):210:210 -> createWorklist
+    1:2:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):257:258 -> enqueueMarkFieldKeptAction
+    1:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):239:240 -> enqueueMarkInstantiatedAction
+    1:2:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):251:252 -> enqueueMarkMethodKeptAction
+    1:2:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):245:246 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):222:222 -> enqueueMarkReachableDirectAction
+    1:2:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):231:232 -> enqueueMarkReachableFieldAction
+    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):226:226 -> enqueueMarkReachableSuperAction
+    1:2:void enqueueTraceConstClassAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):262:263 -> enqueueTraceConstClassAction
+    1:2:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):268:269 -> enqueueTraceInvokeDirectAction
+    1:1:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):273:273 -> enqueueTraceNewInstanceAction
+    1:2:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):277:278 -> enqueueTraceStaticFieldRead
+    1:1:boolean isEmpty():214:214 -> isEmpty
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():218:218 -> poll
 com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction:
-    1:1:void <init>():20:20 -> <init>
+    1:1:void <init>():21:21 -> <init>
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction:
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):156:159 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):164:164 -> run
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):127:130 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):135:135 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction:
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):105:108 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):113:113 -> run
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):76:79 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):84:84 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction:
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):138:141 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):146:146 -> run
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):109:112 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):117:117 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):121:123 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):128:128 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):92:94 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):99:99 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):28:30 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):35:35 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):29:31 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):36:36 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):88:90 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):95:95 -> run
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):58:60 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):65:65 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):59:61 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):66:66 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):73:75 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):80:80 -> run
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):43:45 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):50:50 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):44:46 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):51:51 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):172:174 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):179:179 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):143:145 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):150:150 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction:
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):189:192 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):197:197 -> run
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):160:163 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):168:168 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):205:207 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):212:212 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):176:178 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):183:183 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):220:222 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):227:227 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):191:193 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):198:198 -> run
 com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.shaking.FilteredClassPath:
     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>
     6:6:void <init>(java.nio.file.Path):35:35 -> <init>
@@ -58948,86 +59165,86 @@
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
     1:6:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):261:266 -> a
     7:8:void lambda$markMatchingVisibleMethods$5(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.DexEncodedMethod):440:441 -> a
-    9:10: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.DexEncodedMethod):625:626 -> a
-    11:12: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.DexEncodedField):658:659 -> a
-    13:13:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):816:816 -> a
+    9:10: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.DexEncodedMethod):624:625 -> a
+    11:12: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.DexEncodedField):657:658 -> a
+    13:13:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):815:815 -> a
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
-    14:14:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):816 -> a
-    15:15:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):816:816 -> a
-    16:16:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):1046:1046 -> a
-    17:17:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):1054:1054 -> a
+    14:14:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):815 -> a
+    15:15:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):815:815 -> a
+    16:16:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):1045:1045 -> a
+    17:17:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):1053:1053 -> a
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.RootSetBuilder):67:67 -> access$300
     1:1:com.android.tools.r8.shaking.DexStringCache access$400(com.android.tools.r8.shaking.RootSetBuilder):67:67 -> access$400
     1:1:boolean access$500(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):67:67 -> access$500
     1:1:java.util.Queue access$600(com.android.tools.r8.shaking.RootSetBuilder):67:67 -> access$600
     1:1:com.android.tools.r8.graph.DexDefinition access$700(com.android.tools.r8.graph.DexDefinition,java.util.Map):67:67 -> access$700
     1:1:void access$800(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):67:67 -> access$800
-    1:21:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):993:1013 -> addItemToSets
+    1:21:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):992:1012 -> addItemToSets
     22:22:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> addItemToSets
-    22:22:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1013 -> addItemToSets
-    23:26:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1019:1022 -> addItemToSets
+    22:22:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1012 -> addItemToSets
+    23:26:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1018:1021 -> addItemToSets
     27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> addItemToSets
-    27:27:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1022 -> addItemToSets
-    28:33:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1023:1028 -> addItemToSets
-    34:55:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1025:1046 -> addItemToSets
+    27:27:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1021 -> addItemToSets
+    28:33:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1022:1027 -> addItemToSets
+    34:55:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1024:1045 -> addItemToSets
     56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> addItemToSets
-    56:56:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1046 -> addItemToSets
-    57:113:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1046:1102 -> addItemToSets
-    114:114:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1096:1096 -> addItemToSets
-    115:133:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1093:1111 -> addItemToSets
-    134:157:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1108:1131 -> addItemToSets
-    158:166:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1125:1133 -> addItemToSets
-    167:195:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1116:1144 -> addItemToSets
-    196:240:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1142:1186 -> addItemToSets
-    1:2:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):822:823 -> allRulesSatisfied
-    1:26:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):780:805 -> anyImplementedInterfaceMatchesImplementsRule
-    1:6:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):812:817 -> anySourceMatchesInheritanceRuleDirectly
-    1:13:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):748:760 -> anySuperTypeMatchesExtendsRule
+    56:56:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1045 -> addItemToSets
+    57:113:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1045:1101 -> addItemToSets
+    114:114:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1095:1095 -> addItemToSets
+    115:133:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1092:1110 -> addItemToSets
+    134:157:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1107:1130 -> addItemToSets
+    158:166:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1124:1132 -> addItemToSets
+    167:195:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1115:1143 -> addItemToSets
+    196:240:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1141:1185 -> addItemToSets
+    1:2:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):821:822 -> allRulesSatisfied
+    1:26:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):779:804 -> anyImplementedInterfaceMatchesImplementsRule
+    1:6:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):811:816 -> anySourceMatchesInheritanceRuleDirectly
+    1:13:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):747:759 -> anySuperTypeMatchesExtendsRule
     1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):173:173 -> b
     2:3: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.DexEncodedMethod):448:449 -> b
-    4:5:void lambda$markMatchingOverriddenMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):610:611 -> b
-    6:7:void lambda$markMatchingVisibleFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):643:644 -> b
-    8:8:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):1055:1055 -> b
+    4:5:void lambda$markMatchingOverriddenMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):609:610 -> b
+    6:7:void lambda$markMatchingVisibleFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):642:643 -> b
+    8:8:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):1054:1054 -> b
     1:9:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():387:395 -> buildConsequentRootSet
     boolean lambda$process$2(com.android.tools.r8.graph.DexDefinition) -> c
-    1:1:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1058:1058 -> c
-    1:1:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):577:577 -> canInsertForwardingMethod
+    1:1:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1057:1057 -> c
+    1:1:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):576:576 -> canInsertForwardingMethod
     2:3:boolean com.android.tools.r8.utils.ArrayUtils.contains(java.lang.Object[],java.lang.Object):110:111 -> canInsertForwardingMethod
-    2:3:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):578 -> canInsertForwardingMethod
-    1:1:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):864:864 -> containsAnnotation
-    2:6:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):868:872 -> containsAnnotation
-    7:7:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):880:880 -> containsAnnotation
-    8:12:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):888:892 -> containsAnnotation
+    2:3:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):577 -> canInsertForwardingMethod
+    1:1:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):863:863 -> containsAnnotation
+    2:6:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):867:871 -> containsAnnotation
+    7:7:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):879:879 -> containsAnnotation
+    8:12:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):887:891 -> containsAnnotation
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$18(com.android.tools.r8.graph.DexReference) -> d
     boolean lambda$process$3(com.android.tools.r8.graph.DexDefinition) -> d
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$19(com.android.tools.r8.graph.DexReference) -> e
-    1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):965:965 -> f
-    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):966:966 -> g
-    1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):950:959 -> includeDescriptor
+    1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):964:964 -> f
+    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):965:965 -> g
+    1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):949:958 -> includeDescriptor
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> includeDescriptor
-    11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):959 -> includeDescriptor
-    12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):960:969 -> includeDescriptor
-    1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):973:983 -> includeDescriptorClasses
-    1:2:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):943:944 -> markClass
+    11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):958 -> includeDescriptor
+    12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):959:968 -> includeDescriptor
+    1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):972:982 -> includeDescriptorClasses
+    1:2:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):942:943 -> markClass
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markClass
-    3:3:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):944 -> markClass
-    4:4:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):946:946 -> markClass
-    1:4:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):931:934 -> markField
+    3:3:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):943 -> markClass
+    4:4:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):945:945 -> markClass
+    1:4:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):930:933 -> markField
     5:5:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markField
-    5:5:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):934 -> markField
-    6:6:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):937:937 -> markField
-    1:1: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):656:656 -> markMatchingFields
-    1:1:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):623:623 -> markMatchingMethods
-    1:11:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,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):589:599 -> markMatchingOverriddenMethods
+    5:5:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):933 -> markField
+    6:6:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):936:936 -> markField
+    1:1: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):655:655 -> markMatchingFields
+    1:1:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):622:622 -> markMatchingMethods
+    1:11:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,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):588:598 -> markMatchingOverriddenMethods
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> markMatchingOverriddenMethods
-    12:12:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,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):599 -> markMatchingOverriddenMethods
-    13:23:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,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):603:613 -> markMatchingOverriddenMethods
-    1:9: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):638:646 -> markMatchingVisibleFields
+    12:12:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,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):598 -> markMatchingOverriddenMethods
+    13:23:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,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):602:612 -> markMatchingOverriddenMethods
+    1:9: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):637:645 -> markMatchingVisibleFields
     1:38:void markMatchingVisibleMethods(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):426:463 -> markMatchingVisibleMethods
-    1:8:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):907:914 -> markMethod
+    1:8:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):906:913 -> markMethod
     9:9:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethod
-    9:9:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):914 -> markMethod
-    10:12:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):918:920 -> markMethod
+    9:9:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):913 -> markMethod
+    10:12:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):917:919 -> markMethod
     1:59:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):127:185 -> process
     60:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):162:181 -> process
     80:158:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):155:233 -> process
@@ -59037,94 +59254,94 @@
     166:166:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):192:192 -> process
     1:12:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):330:341 -> propagateAssumeRules
     13:44:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):351:382 -> propagateAssumeRules
-    1:4:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):835:838 -> ruleSatisfied
-    1:3:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):853:855 -> ruleSatisfiedByFields
-    1:3:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):842:844 -> ruleSatisfiedByMethods
+    1:4:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):834:837 -> ruleSatisfied
+    1:3:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):852:854 -> ruleSatisfiedByFields
+    1:3:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):841:843 -> ruleSatisfiedByMethods
     1:28:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):273:300 -> run
     29:56:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):299:326 -> run
     57:57:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):289:289 -> run
     1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):243:258 -> runPerRule
     17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):257:257 -> runPerRule
-    1:2:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):721:722 -> satisfyAccessFlag
-    1:1:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):726:726 -> satisfyAnnotation
-    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):717:717 -> satisfyClassType
-    1:6:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):738:743 -> satisfyExtendsRule
-    1:6:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):766:771 -> satisfyImplementsRule
-    1:5:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):730:734 -> satisfyInheritanceRule
+    1:2:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):720:721 -> satisfyAccessFlag
+    1:1:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):725:725 -> satisfyAnnotation
+    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):716:716 -> satisfyClassType
+    1:6:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):737:742 -> satisfyExtendsRule
+    1:6:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):765:770 -> satisfyImplementsRule
+    1:5:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):729:733 -> satisfyInheritanceRule
     1:10:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):405:414 -> testAndGetPrecondition
-    1:14:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):666:679 -> writeSeeds
-    15:40:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):674:699 -> writeSeeds
-    41:56:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):698:713 -> writeSeeds
+    1:14:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):665:678 -> writeSeeds
+    15:40:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):673:698 -> writeSeeds
+    41:56:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):697:712 -> writeSeeds
 com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.RootSetBuilder$1:
-    1:1:void <clinit>():1146:1146 -> <clinit>
-    2:2:void <clinit>():1135:1135 -> <clinit>
-    3:3:void <clinit>():1123:1123 -> <clinit>
-    4:4:void <clinit>():1091:1091 -> <clinit>
+    1:1:void <clinit>():1145:1145 -> <clinit>
+    2:2:void <clinit>():1134:1134 -> <clinit>
+    3:3:void <clinit>():1122:1122 -> <clinit>
+    4:4:void <clinit>():1090:1090 -> <clinit>
     5:5:void <clinit>():152:152 -> <clinit>
 com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet:
-    1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1576:1576 -> <init>
-    2:10:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.List):1594:1602 -> <init>
+    1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1575:1575 -> <init>
+    2:10:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.List):1593:1601 -> <init>
 com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.RootSetBuilder$RootSet:
-    1:1:void <clinit>():1190:1190 -> <clinit>
-    1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,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,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1190:1190 -> <init>
-    2:26:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,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,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List):1242:1266 -> <init>
+    1:1:void <clinit>():1189:1189 -> <clinit>
+    1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,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,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1189:1189 -> <init>
+    2:26:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,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,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List):1241:1265 -> <init>
     1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):176:176 -> a
-    1:1:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1345 -> a
-    2:4:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1347:1349 -> a
-    5:5:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexReference):1295:1295 -> a
-    6:6:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexReference,java.util.Set):1295:1295 -> a
-    7:8:void lambda$addConsequentRootSet$3(com.android.tools.r8.graph.DexType,java.util.Set):1300:1301 -> a
-    9:9:java.util.Set lambda$addConsequentRootSet$2(com.android.tools.r8.graph.DexType):1301:1301 -> a
-    10:11:void lambda$addDependentItems$5(com.android.tools.r8.graph.DexReference,java.util.Map):1311:1312 -> a
-    12:12:void lambda$toString$9(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1568:1568 -> a
-    1:14:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1289:1302 -> addConsequentRootSet
-    1:1:void addDependentItems(java.util.Map):1308:1308 -> addDependentItems
+    1:1:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1344 -> a
+    2:4:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1346:1348 -> a
+    5:5:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexReference):1294:1294 -> a
+    6:6:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexReference,java.util.Set):1294:1294 -> a
+    7:8:void lambda$addConsequentRootSet$3(com.android.tools.r8.graph.DexType,java.util.Set):1299:1300 -> a
+    9:9:java.util.Set lambda$addConsequentRootSet$2(com.android.tools.r8.graph.DexType):1300:1300 -> a
+    10:11:void lambda$addDependentItems$5(com.android.tools.r8.graph.DexReference,java.util.Map):1310:1311 -> a
+    12:12:void lambda$toString$9(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1567:1567 -> a
+    1:14:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1288:1301 -> addConsequentRootSet
+    1:1:void addDependentItems(java.util.Map):1307:1307 -> addDependentItems
     1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):176:176 -> b
-    1:1:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1331 -> b
-    2:3:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1332:1333 -> b
-    4:4:java.util.Map lambda$addDependentItems$4(com.android.tools.r8.graph.DexReference):1311:1311 -> b
-    5:5:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):1488:1488 -> b
-    1:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1270:1281 -> checkAllRulesAreUsed
-    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1278:1278 -> checkAllRulesAreUsed
+    1:1:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1330 -> b
+    2:3:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1331:1332 -> b
+    4:4:java.util.Map lambda$addDependentItems$4(com.android.tools.r8.graph.DexReference):1310:1310 -> b
+    5:5:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):1487:1487 -> b
+    1:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1269:1280 -> checkAllRulesAreUsed
+    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1277:1277 -> checkAllRulesAreUsed
     14:16:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> checkAllRulesAreUsed
-    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1278 -> checkAllRulesAreUsed
-    1:14:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1355:1368 -> copy
-    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1342:1343 -> forEachDependentNonStaticMember
-    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1328:1329 -> forEachDependentStaticMember
-    1:2:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1320:1321 -> getDependentItems
-    3:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1320:1320 -> getDependentItems
-    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1316:1316 -> getDependentKeepClassCompatRule
-    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1455:1463 -> isKeptDirectlyOrIndirectly
-    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1390:1390 -> mayBeMinified
-    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1394:1396 -> mayNotBeMinified
-    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1395:1399 -> mayNotBeMinified
-    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1398:1403 -> mayNotBeMinified
-    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1402:1402 -> mayNotBeMinified
-    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1381:1382 -> move
-    1:5:void prune(com.android.tools.r8.graph.DexReference):1373:1377 -> prune
-    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1386:1386 -> shouldNotBeMinified
-    1:21:java.lang.String toString():1550:1570 -> toString
-    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1408:1411 -> verifyKeptFieldsAreAccessedAndLive
+    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1277 -> checkAllRulesAreUsed
+    1:14:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1354:1367 -> copy
+    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1341:1342 -> forEachDependentNonStaticMember
+    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1327:1328 -> forEachDependentStaticMember
+    1:2:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1319:1320 -> getDependentItems
+    3:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1319:1319 -> getDependentItems
+    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1315:1315 -> getDependentKeepClassCompatRule
+    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1454:1462 -> isKeptDirectlyOrIndirectly
+    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1389:1389 -> mayBeMinified
+    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1393:1395 -> mayNotBeMinified
+    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1394:1398 -> mayNotBeMinified
+    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1397:1402 -> mayNotBeMinified
+    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1401:1401 -> mayNotBeMinified
+    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1380:1381 -> move
+    1:5:void prune(com.android.tools.r8.graph.DexReference):1372:1376 -> prune
+    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1385:1385 -> shouldNotBeMinified
+    1:21:java.lang.String toString():1549:1569 -> toString
+    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1407:1410 -> verifyKeptFieldsAreAccessedAndLive
     5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> verifyKeptFieldsAreAccessedAndLive
-    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1413 -> verifyKeptFieldsAreAccessedAndLive
-    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1413:1417 -> verifyKeptFieldsAreAccessedAndLive
-    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1470:1542 -> verifyKeptItemsAreKept
-    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1425:1435 -> verifyKeptMethodsAreTargetedAndLive
-    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1444:1448 -> verifyKeptTypesAreLive
+    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1412 -> verifyKeptFieldsAreAccessedAndLive
+    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1412:1416 -> verifyKeptFieldsAreAccessedAndLive
+    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1469:1541 -> verifyKeptItemsAreKept
+    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1424:1434 -> verifyKeptMethodsAreTargetedAndLive
+    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1443:1447 -> verifyKeptTypesAreLive
 com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules:
     1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetBuilder$1):472:472 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):486:486 -> <init>
     3:16:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):478:491 -> <init>
-    1:3:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):561:563 -> a
+    1:3:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):560:562 -> a
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    4:4:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):562 -> a
-    5:7:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):569:571 -> a
+    4:4:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):561 -> a
+    5:7:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):568:570 -> a
     1:1:void run():495:495 -> run
-    1:17:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):528:544 -> tryAndKeepMethodOnClass
-    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> tryAndKeepMethodOnClass
-    18:18:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):544 -> tryAndKeepMethodOnClass
-    19:33:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):545:559 -> tryAndKeepMethodOnClass
-    34:34:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):556:556 -> tryAndKeepMethodOnClass
+    1:16:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):528:543 -> tryAndKeepMethodOnClass
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> tryAndKeepMethodOnClass
+    17:17:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):543 -> tryAndKeepMethodOnClass
+    18:32:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):544:558 -> tryAndKeepMethodOnClass
+    33:33:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):555:555 -> tryAndKeepMethodOnClass
     1:1:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):499:499 -> visitAllSuperInterfaces
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> visitAllSuperInterfaces
     2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):499 -> visitAllSuperInterfaces
@@ -59251,17 +59468,17 @@
     1:20:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):119:138 -> pruneUnusedInterfaces
     1:30:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):319:348 -> reachableFields
     1:15:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):257:271 -> reachableMethods
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1163:1163 -> reachableMethods
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1170:1170 -> reachableMethods
     16:16:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):271 -> reachableMethods
     17:24:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):271:278 -> reachableMethods
     25:30:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):275:280 -> reachableMethods
-    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1163:1163 -> reachableMethods
+    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1170:1170 -> reachableMethods
     31:31:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):280 -> reachableMethods
     32:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):280:305 -> reachableMethods
     58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> reachableMethods
-    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):745 -> reachableMethods
+    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):752 -> reachableMethods
     58:58:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305 -> reachableMethods
-    59:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):746:747 -> reachableMethods
+    59:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):753:754 -> reachableMethods
     59:60:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305 -> reachableMethods
     61:72:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):304:315 -> reachableMethods
     1:2:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):72:73 -> removeUnused
@@ -60071,14 +60288,20 @@
     31:31:java.lang.Object[] filter(java.lang.Class,java.lang.Object[],java.util.function.Predicate):68:68 -> a
     32:55:java.lang.Object[] map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
     56:56:java.lang.Object[] map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.utils.t:
+com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.utils.t:
+    java.util.List assertionsConfigurations -> b
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defautlTransformation -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():12:12 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.util.List):19:22 -> <init>
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.utils.u:
     java.util.Map original -> a
     java.util.Map inverse -> b
     1:3:void <init>(java.util.Map,java.util.Map):21:23 -> <init>
-com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.utils.u:
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.utils.v:
     boolean isBitInMaskSet(int,int) -> a
     boolean isBitSet(int,int) -> b
-com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.utils.w:
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.utils.x:
     com.android.tools.r8.utils.BooleanLatticeElement BOTTOM -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():6:8 -> <clinit>
@@ -60093,23 +60316,23 @@
     boolean isTrue() -> e
     boolean isUnknown() -> f
     1:1:int hashCode():74:74 -> hashCode
-com.android.tools.r8.utils.BooleanLatticeElement$1 -> com.android.tools.r8.utils.v:
+com.android.tools.r8.utils.BooleanLatticeElement$1 -> com.android.tools.r8.utils.w:
     1:1:void <init>():9:9 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool asOptionalBool():13:13 -> a
     boolean isBottom() -> b
-com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.utils.x:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.utils.y:
     java.lang.Boolean[] VALUES -> a
     1:1:void <clinit>():8:8 -> <clinit>
     int intValue(boolean) -> a
     1:1:java.lang.Boolean[] values():15:15 -> a
-com.android.tools.r8.utils.Box -> com.android.tools.r8.utils.y:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.utils.z:
     java.lang.Object value -> a
     1:1:void <init>():11:11 -> <init>
     2:3:void <init>(java.lang.Object):13:14 -> <init>
     1:1:java.lang.Object get():18:18 -> a
     2:2:void set(java.lang.Object):22:22 -> a
     1:1:boolean isSet():26:26 -> b
-com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.utils.C:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.utils.D:
     java.util.Map sourceMethodMapping -> a
     com.android.tools.r8.utils.AndroidApp inputApp -> b
     boolean $assertionsDisabled -> c
@@ -60124,8 +60347,8 @@
     8:8:void readLineNumbersFromClassFiles():44 -> a
     8:8:java.lang.String lookupNameAndDescriptor(java.lang.String,int):32 -> a
     9:10:java.lang.String lookupNameAndDescriptor(java.lang.String,int):34:35 -> a
-com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.utils.z:
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.utils.A:
+com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.utils.A:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.utils.B:
     com.android.tools.r8.utils.CfLineToMethodMapper this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap currentLineNumberMapping -> c
     1:1:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.CfLineToMethodMapper$1):62:62 -> <init>
@@ -60134,13 +60357,13 @@
     1:3:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):78:80 -> 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[]):86:86 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):80:80 -> c
-com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.utils.B:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.utils.C:
     java.lang.String nameAndDescriptor -> j
     java.util.Map lineMethodMapping -> k
     1:1:void <init>(java.lang.String,java.util.Map,com.android.tools.r8.utils.CfLineToMethodMapper$1):91:91 -> <init>
     2:4:void <init>(java.lang.String,java.util.Map):97:99 -> <init>
     1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):104:104 -> b
-com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.utils.D:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.utils.E:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -60166,7 +60389,7 @@
     7:8:void printIndent():75:76 -> c
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.G:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.H:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -60188,8 +60411,8 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():228:228 -> d
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.utils.E:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.utils.F:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.utils.F:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.utils.G:
     boolean ready -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType type -> c
@@ -60208,7 +60431,7 @@
     1:1:java.lang.Object get():234:234 -> get
     2:42:com.android.tools.r8.graph.DexClass get():251:291 -> get
     43:43:com.android.tools.r8.graph.DexClass get():287:287 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.utils.L:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.utils.M:
     com.android.tools.r8.graph.ClassKind classKind -> a
     1:2:void <init>(com.android.tools.r8.graph.ClassKind):30:31 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
@@ -60219,8 +60442,8 @@
     3:3:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):68 -> a
     4:7:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):69:72 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():36:36 -> b
-com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.utils.H:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.utils.I:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.utils.I:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.utils.J:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -60231,21 +60454,21 @@
     12:18:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):99:105 -> a
     19:21:java.util.Collection collectTypes():112:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.utils.J:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.utils.K:
     java.util.List providers -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List,com.android.tools.r8.utils.ClassProvider$1):151:151 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):155:156 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):161:162 -> a
     3:5:java.util.Collection collectTypes():168:170 -> a
     1:8:java.lang.String toString():177:184 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.utils.K:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.utils.L:
     com.android.tools.r8.com.google.common.collect.Multimap classes -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap,com.android.tools.r8.utils.ClassProvider$1):125:125 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):129:130 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):135:136 -> a
     3:3:java.util.Collection collectTypes():142:142 -> a
     1:1:java.lang.String toString():147:147 -> toString
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.utils.M:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.utils.N:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):14:14 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):12:12 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12:12 -> a
@@ -60262,9 +60485,9 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():29:29 -> c
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.utils.N:
+com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.utils.O:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.utils.O:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.utils.P:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     1:17:void <clinit>():22:38 -> <clinit>
@@ -60280,47 +60503,47 @@
     33:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):201 -> a
     34:34:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):199:199 -> a
     35:39:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):192:196 -> a
-    40:58:java.lang.String getDescriptorFromKmType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):368:386 -> a
-    59:65:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):407:413 -> a
-    66:66:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):412:412 -> a
-    67:67:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):410:410 -> a
-    68:75:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):418:425 -> a
-    76:79:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):424:427 -> a
-    80:84:java.lang.String guessTypeDescriptor(java.nio.file.Path):499:503 -> a
-    85:85:java.lang.String getPathFromJavaType(java.lang.Class):573:573 -> a
+    40:58:java.lang.String getDescriptorFromKmType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):372:390 -> a
+    59:65:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):411:417 -> a
+    66:66:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):416:416 -> a
+    67:67:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):414:414 -> a
+    68:75:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):422:429 -> a
+    76:79:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):428:431 -> a
+    80:84:java.lang.String guessTypeDescriptor(java.nio.file.Path):503:507 -> a
+    85:85:java.lang.String getPathFromJavaType(java.lang.Class):577:577 -> a
     1:1:java.lang.String descriptorToJavaType(java.lang.String):160:160 -> b
-    1:3:int getArgumentCount(java.lang.String):646:648 -> c
-    1:36:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):600:635 -> d
-    37:42:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):621:626 -> d
-    43:67:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):608:632 -> d
-    68:68:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):617:617 -> d
-    1:2:java.lang.String getBinaryNameFromDescriptor(java.lang.String):333:334 -> e
+    1:3:int getArgumentCount(java.lang.String):650:652 -> c
+    1:36:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):604:639 -> d
+    37:42:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):625:630 -> d
+    43:67:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):612:636 -> d
+    68:68:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):621:621 -> d
+    1:2:java.lang.String getBinaryNameFromDescriptor(java.lang.String):337:338 -> e
     1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):329:329 -> f
     1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):307:309 -> g
-    1:2:java.lang.String getClassFileName(java.lang.String):582:583 -> h
+    1:2:java.lang.String getClassFileName(java.lang.String):586:587 -> h
     1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):275:276 -> i
-    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):344:345 -> j
-    1:3:java.lang.String getDescriptorFromKotlinClassifier(java.lang.String):354:356 -> k
+    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):348:349 -> j
+    1:3:java.lang.String getDescriptorFromKotlinClassifier(java.lang.String):358:360 -> k
     1:1:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):319:319 -> l
-    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):477:479 -> m
+    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):481:483 -> m
     1:1:java.lang.String getPackageNameFromDescriptor(java.lang.String):297:297 -> n
-    1:3:java.lang.String getPathFromDescriptor(java.lang.String):567:569 -> o
-    1:2:java.lang.String getPathFromJavaType(java.lang.String):577:578 -> p
-    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):587:588 -> q
+    1:3:java.lang.String getPathFromDescriptor(java.lang.String):571:573 -> o
+    1:2:java.lang.String getPathFromJavaType(java.lang.String):581:582 -> p
+    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):591:592 -> q
     1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):265:265 -> r
-    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):401:402 -> r
+    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):405:406 -> r
     2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):265 -> r
-    1:13:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):550:562 -> s
-    14:14:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):560:560 -> s
+    1:13:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):554:566 -> s
+    14:14:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):564:564 -> s
     15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> s
-    15:15:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):560 -> s
-    16:16:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):560:560 -> s
-    1:8:java.lang.String guessTypeDescriptor(java.lang.String):515:522 -> t
-    9:9:java.lang.String guessTypeDescriptor(java.lang.String):520:520 -> t
+    15:15:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):564 -> s
+    16:16:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):564:564 -> s
+    1:8:java.lang.String guessTypeDescriptor(java.lang.String):519:526 -> t
+    9:9:java.lang.String guessTypeDescriptor(java.lang.String):524:524 -> t
     10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> t
-    10:10:java.lang.String guessTypeDescriptor(java.lang.String):520 -> t
-    11:11:java.lang.String guessTypeDescriptor(java.lang.String):520:520 -> t
-    1:26:boolean isClassDescriptor(java.lang.String):434:459 -> u
+    10:10:java.lang.String guessTypeDescriptor(java.lang.String):524 -> t
+    11:11:java.lang.String guessTypeDescriptor(java.lang.String):524:524 -> t
+    1:26:boolean isClassDescriptor(java.lang.String):438:463 -> u
     1:1:boolean isDescriptor(java.lang.String):228:228 -> v
     2:5:boolean isPrimitiveDescriptor(java.lang.String):206:209 -> v
     2:5:boolean isDescriptor(java.lang.String):229 -> v
@@ -60330,18 +60553,18 @@
     1:2:java.lang.String javaTypeToDescriptor(java.lang.String):68:69 -> x
     1:2:java.lang.String javaTypeToDescriptorIfValidJavaType(java.lang.String):94:95 -> y
     1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):83:84 -> z
-com.android.tools.r8.utils.DescriptorUtils$1 -> com.android.tools.r8.utils.O$a:
+com.android.tools.r8.utils.DescriptorUtils$1 -> com.android.tools.r8.utils.P$a:
     com.android.tools.r8.utils.Box val$descriptor -> b
-    1:1:void <init>(com.android.tools.r8.utils.Box):369:369 -> <init>
-    1:2:void visitClass(java.lang.String):374:375 -> a
-    1:2:void visitTypeAlias(java.lang.String):382:383 -> b
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.utils.O$b:
+    1:1:void <init>(com.android.tools.r8.utils.Box):373:373 -> <init>
+    1:2:void visitClass(java.lang.String):378:379 -> a
+    1:2:void visitTypeAlias(java.lang.String):386:387 -> b
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.utils.P$b:
     java.lang.String module -> a
     java.lang.String descriptor -> b
-    1:3:void <init>(java.lang.String,java.lang.String):529:531 -> <init>
-    1:1:java.lang.String getDescriptor():539:539 -> a
-    1:1:java.lang.String getModule():535:535 -> b
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.utils.P:
+    1:3:void <init>(java.lang.String,java.lang.String):533:535 -> <init>
+    1:1:java.lang.String getDescriptor():543:543 -> a
+    1:1:java.lang.String getModule():539:539 -> b
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.utils.Q:
     byte[] dexVersionBytes -> b
     com.android.tools.r8.utils.DexVersion[] $VALUES -> g
     com.android.tools.r8.utils.DexVersion V35 -> c
@@ -60367,13 +60590,13 @@
     44:44:java.util.Optional getDexVersion(int):86:86 -> b
     45:45:java.util.Optional getDexVersion(int):84:84 -> b
     46:46:java.util.Optional getDexVersion(int):82:82 -> b
-com.android.tools.r8.utils.DiagnosticWithThrowable -> com.android.tools.r8.utils.Q:
+com.android.tools.r8.utils.DiagnosticWithThrowable -> com.android.tools.r8.utils.S:
     java.lang.Throwable throwable -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(java.lang.Throwable):13:15 -> <init>
     1:1:java.lang.Throwable getThrowable():19:19 -> getThrowable
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.utils.S:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.utils.T:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
@@ -60387,7 +60610,7 @@
     24:24:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):73:73 -> a
     25:25:java.nio.file.Path getPath():83:83 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():78:78 -> getOrigin
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.utils.T:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.utils.U:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -60403,7 +60626,7 @@
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> e
     1:1:java.util.Set lambda$collectSets$0(java.lang.Object):143:143 -> f
     1:12:java.lang.String toString():150:161 -> toString
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.utils.U:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.utils.V:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:6:int putBitsFromRightZeroExtended(com.android.tools.r8.dex.DexOutputBuffer,long,int):84:89 -> a
@@ -60426,7 +60649,7 @@
     14:14:java.lang.String getDiagnosticMessage():45:45 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.V:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.W:
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> a
     2:2:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):27:27 -> a
     3:3:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):27:27 -> a
@@ -60472,8 +60695,8 @@
     1:2:boolean com.android.tools.r8.utils.IdentifierUtils.isRelaxedDexIdentifierPart(int):18:19 -> c
     boolean com.android.tools.r8.utils.IdentifierUtils.isSimpleNameChar(int) -> d
     boolean com.android.tools.r8.utils.IdentifierUtils.isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.V$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.V$b:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.W$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.W$b:
 com.android.tools.r8.utils.FeatureClassMapping -> com.android.tools.r8.utils.FeatureClassMapping:
     java.util.Map parsedRules -> a
     java.util.Map parseNonClassRules -> b
@@ -60533,7 +60756,7 @@
 com.android.tools.r8.utils.FeatureClassMapping$SpecificationOrigin -> com.android.tools.r8.utils.FeatureClassMapping$e:
     1:1:void <init>(java.nio.file.Path):72:72 -> <init>
     1:1:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.utils.W:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.utils.X:
     boolean ignoreName -> a
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> b
@@ -60547,7 +60770,7 @@
     1:1:int doHash(java.lang.Object):14:14 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexField):45:48 -> doHash
     2:5:int doHash(java.lang.Object):14 -> doHash
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.X:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.Y:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -60571,14 +60794,14 @@
     1:2:boolean isVDexFile(java.nio.file.Path):44:45 -> f
     1:2:boolean isZipFile(java.nio.file.Path):63:64 -> g
     1:1:java.util.List readAllLines(java.nio.file.Path):90:90 -> h
-com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.Y:
+com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.Z:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.shaking.FilteredClassPath,java.lang.String):13:13 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.utils.Z:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.utils.a0:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):22:23 -> <init>
     1:1:java.lang.String part():28:28 -> part
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.utils.a0:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.utils.b0:
     com.sun.management.HotSpotDiagnosticMXBean hotSpotDiagnosticMXBean -> a
     1:3:void initHotSpotMBean():19:21 -> a
     1:3:void dumpHeap(java.nio.file.Path,boolean):35 -> a
@@ -60588,17 +60811,17 @@
     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.utils.b0:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.utils.c0:
     java.lang.Iterable order(java.lang.Iterable) -> a
     java.util.Collection order(java.util.Collection) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.utils.b0$a:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.utils.c0$a:
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     java.lang.Iterable order(java.lang.Iterable) -> a
     java.util.Collection order(java.util.Collection) -> a
     1:1:com.android.tools.r8.utils.IROrdering$IdentityIROrdering getInstance():26:26 -> a
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.utils.b0$b:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.utils.c0$b:
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void <init>():44:44 -> <init>
@@ -60608,9 +60831,9 @@
     4:5:java.util.List order(java.lang.Iterable):52:53 -> a
     4:5:java.util.List order(java.util.Collection):59 -> a
     4:5:java.util.Collection order(java.util.Collection):40 -> a
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.utils.c0:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.utils.d0:
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.d0:
+com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.e0:
     java.util.Set descriptors -> c
     com.android.tools.r8.origin.Origin origin -> b
     java.util.zip.ZipFile openedZipFile -> d
@@ -60633,138 +60856,139 @@
     25:25:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.e0:
-    java.lang.String printCfgFile -> I0
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> f1
-    boolean enableRedundantConstNumberOptimization -> f0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> i1
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.f0:
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> f0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> i1
     boolean enableCfInterfaceMethodDesugaring -> P
     java.lang.String dumpInputToDirectory -> j
-    com.android.tools.r8.AssertionsConfiguration assertionsConfiguration -> L0
     boolean enableRedundantFieldLoadElimination -> b0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> R0
-    int SUPPORTED_DEX_VERSION -> m1
-    java.util.Map warningInvalidDebugInfo -> Y0
+    java.util.Map warningInvalidParameterAnnotations -> Y0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
     boolean enableStringSwitchConversion -> X
     boolean enableHorizontalClassMerging -> q
-    boolean skipReadingDexCode -> Z0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> d1
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> R0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> d1
+    boolean enableInheritanceClassInDexDistributor -> V0
     boolean applyInliningToInlinee -> y
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> h1
     boolean enableDeterminismAnalysis -> G
     int inliningInstructionLimit -> T
-    boolean skipIR -> N0
+    boolean configurationDebugging -> N0
+    java.util.function.Consumer syntheticProguardRulesConsumer -> l1
+    boolean $assertionsDisabled -> o1
     boolean printMemory -> h
-    boolean ignoreMissingClasses -> J0
-    boolean enableMainDexListCheck -> E0
+    boolean lookupLibraryBeforeProgram -> E0
     java.lang.String dumpInputToFile -> i
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> C0
     boolean enableNameReflectionOptimization -> I
-    java.util.List mainDexKeepRules -> S0
+    int numberOfThreads -> h0
+    boolean enableNestReduction -> A0
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> W0
     boolean enableVerticalClassMerging -> r
-    boolean enableNestReduction -> z0
-    boolean enableLoadStoreOptimization -> v0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> q0
+    boolean enableNestBasedAccessDesugaring -> z0
+    java.util.Set reportedMissingForDesugaring -> m1
     boolean enableEnumValueOptimization -> Y
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> k1
     boolean enableServiceLoaderRewriting -> H
     int inliningInstructionAllowance -> U
-    boolean quiet -> j0
+    boolean hasMarker -> n0
+    boolean verbose -> j0
     boolean encodeChecksums -> N
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> j1
     boolean enableDynamicTypeOptimization -> o
+    boolean enableRedundantConstNumberOptimization -> g0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> S0
     boolean enableValuePropagation -> c0
-    java.util.Map warningInvalidParameterAnnotations -> X0
+    java.util.Map missingEnclosingMembers -> X0
     boolean enableNonNullTracking -> w
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> a1
-    com.android.tools.r8.StringConsumer configurationConsumer -> e1
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> e1
     boolean enableInitializedClassesAnalysis -> E
     int inliningMonitorEnterValuesAllowance -> V
-    boolean debug -> O0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> k1
+    boolean skipIR -> O0
     com.android.tools.r8.ProgramConsumer programConsumer -> d
     java.util.Set neverMergePrefixes -> m
-    boolean forceProguardCompatibility -> K0
+    boolean ignoreMissingClasses -> K0
     java.util.function.BiPredicate dexClassChecksumFilter -> O
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> B0
-    boolean enableTreeShaking -> F0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> B0
+    boolean enableMainDexListCheck -> F0
     boolean enableFieldBitAccessAnalysis -> p
-    int numberOfThreads -> g0
     com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> Z
     boolean enableInlining -> x
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> V0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> p0
-    java.util.Set reportedMissingForDesugaring -> l1
-    boolean enableLambdaMerging -> w0
-    boolean intermediate -> s0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> j1
+    java.util.Set extensiveLoggingFilter -> p0
+    java.util.List mainDexKeepRules -> T0
+    int minApiLevel -> s0
+    boolean enableLoadStoreOptimization -> w0
     boolean enableSideEffectAnalysis -> F
     int inliningControlFlowResolutionBlocksThreshold -> W
     boolean printTimes -> g
-    boolean invalidDebugInfoFatal -> k0
+    boolean quiet -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableValuePropagationForInstanceFields -> d0
+    com.android.tools.r8.dex.Marker marker -> o0
     boolean enablePropagationOfDynamicTypesAtCallSites -> L
     boolean enableUnusedInterfaceRemoval -> u
-    java.util.List logArgumentsFilter -> u0
-    java.util.Map missingEnclosingMembers -> W0
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean minimalMainDex -> T0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> b1
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> P0
-    boolean printCfg -> H0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> b1
+    boolean debug -> P0
+    com.android.tools.r8.StringConsumer configurationConsumer -> f1
+    boolean forceProguardCompatibility -> L0
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> M0
+    boolean enableMinification -> H0
     boolean enableClassInlining -> C
     boolean enablePropagationOfConstantsAtCallSites -> M
     boolean libraryInterfacesMayHaveStaticInitialization -> n
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> A0
-    boolean enableMinification -> G0
-    boolean processCovariantReturnTypeAnnotations -> C0
+    boolean enableTreeShaking -> G0
     boolean enableDevirtualization -> v
-    java.util.Set extensiveLoggingFilter -> o0
-    boolean enableDesugaring -> x0
-    java.util.List methodsFilter -> q0
-    boolean readCompileTimeAnnotations -> t0
-    int minApiLevel -> r0
+    boolean enableLambdaMerging -> x0
+    boolean intermediate -> t0
     int applyInliningToInlineeMaxDepth -> z
-    boolean ignoreMainDexMissingClasses -> l0
-    boolean useSmaliSyntax -> h0
+    boolean invalidDebugInfoFatal -> l0
     boolean enableClassStaticizer -> D
     int callGraphLikelySpuriousCallEdgeThreshold -> Q
+    java.lang.String printCfgFile -> J0
     boolean enableUninstantiatedTypeOptimization -> e0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> h1
-    com.android.tools.r8.dex.Marker marker -> n0
     boolean enableStringConcatenationOptimization -> J
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> a0
     boolean passthroughDexCode -> k
+    java.util.List logArgumentsFilter -> v0
+    java.util.Map warningInvalidDebugInfo -> Z0
     boolean enableArgumentRemoval -> s
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> Q0
-    boolean enableInheritanceClassInDexDistributor -> U0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> c1
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> g1
-    boolean $assertionsDisabled -> n1
-    boolean configurationDebugging -> M0
+    java.util.List methodsFilter -> r0
+    int SUPPORTED_DEX_VERSION -> n1
+    boolean minimalMainDex -> U0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> c1
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> Q0
     boolean enableInliningOfInvokesWithNullableReceivers -> A
     int classInliningInstructionLimit -> R
-    boolean lookupLibraryBeforeProgram -> D0
+    boolean printCfg -> I0
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> g1
+    boolean processCovariantReturnTypeAnnotations -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
+    boolean skipReadingDexCode -> a1
     boolean enableTreeShakingOfLibraryMethodOverrides -> K
     boolean enableNeverMergePrefixes -> l
-    boolean enableNestBasedAccessDesugaring -> y0
+    boolean enableDesugaring -> y0
     boolean enableUnusedArgumentRemoval -> t
-    boolean hasMarker -> m0
+    boolean readCompileTimeAnnotations -> u0
+    boolean ignoreMainDexMissingClasses -> m0
     boolean disableInliningOfLibraryMethodOverrides -> B
     int classInliningInstructionAllowance -> S
-    boolean verbose -> i0
-    1:14:void <clinit>():67:80 -> <clinit>
-    1:1:void <init>():104:104 -> <init>
-    2:544:void <init>():98:640 -> <init>
-    545:549:void <init>():105:109 -> <init>
-    550:550:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113:113 -> <init>
-    551:1093:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):98:640 -> <init>
-    1094:1101:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):114:121 -> <init>
-    1102:1102:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):125:125 -> <init>
-    1103:1645:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):98:640 -> <init>
-    1646:1657:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):126:137 -> <init>
-    1:1:boolean hasMethodsFilter():890:890 -> A
-    1:1:boolean hasProguardConfiguration():87:87 -> B
-    1:1:boolean hasUsageInformationConsumer():597:597 -> C
+    boolean useSmaliSyntax -> i0
+    1:14:void <clinit>():66:79 -> <clinit>
+    1:1:void <init>():103:103 -> <init>
+    2:548:void <init>():97:643 -> <init>
+    549:553:void <init>():104:108 -> <init>
+    554:554:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):112:112 -> <init>
+    555:1101:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):97:643 -> <init>
+    1102:1109:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113:120 -> <init>
+    1110:1110:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):124:124 -> <init>
+    1111:1657:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):97:643 -> <init>
+    1658:1669:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):125:136 -> <init>
+    1:1:boolean hasMethodsFilter():893:893 -> A
+    1:1:boolean hasProguardConfiguration():86:86 -> B
+    1:1:boolean hasUsageInformationConsumer():600:600 -> C
     1:1:boolean isDesugaredLibraryCompilation():316:316 -> D
     1:1:boolean isGeneratingClassFiles():337:337 -> E
     1:1:boolean isGeneratingDexIndexed():329:329 -> F
@@ -60772,24 +60996,24 @@
     2:2:boolean isGeneratingDexFilePerClassFile():333:333 -> F
     2:2:boolean isGeneratingDex():325 -> F
     1:1:boolean hasConsumer():300:300 -> G
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1122 -> G
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1125:1127 -> G
-    1:1:boolean isMinifying():429:429 -> H
-    1:1:boolean isShrinking():425:425 -> I
-    1:1:boolean isStringSwitchConversionEnabled():1131:1131 -> J
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():468:468 -> K
-    1:32:boolean printWarnings():815:846 -> L
-    33:72:boolean printWarnings():842:881 -> L
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():464:464 -> M
-    1:4:boolean shouldDesugarNests():372:375 -> N
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1125 -> G
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1128:1130 -> G
+    1:1:boolean isMinifying():432:432 -> H
+    1:1:boolean isShrinking():428:428 -> I
+    1:1:boolean isStringSwitchConversionEnabled():1134:1134 -> J
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():471:471 -> K
+    1:32:boolean printWarnings():818:849 -> L
+    33:72:boolean printWarnings():845:884 -> L
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():467:467 -> M
+    1:4:boolean shouldDesugarNests():375:378 -> N
     5:5:boolean isGeneratingClassFiles():337:337 -> N
-    5:5:boolean canUseNestBasedAccess():1105 -> N
-    5:5:boolean shouldDesugarNests():375 -> N
-    1:13:void signalFinishedToConsumers():353:365 -> O
-    1:1:boolean assertionsEnabled():635:635 -> P
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():502:510 -> Q
-    1:9:java.util.Set getExtensiveLoggingFilter():476:484 -> R
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():472:472 -> S
+    5:5:boolean canUseNestBasedAccess():1108 -> N
+    5:5:boolean shouldDesugarNests():378 -> N
+    1:18:void signalFinishedToConsumers():353:370 -> O
+    1:1:boolean assertionsEnabled():638:638 -> P
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():505:513 -> Q
+    1:9:java.util.Set getExtensiveLoggingFilter():479:487 -> R
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():475:475 -> S
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
     1:2:void setMarker(com.android.tools.r8.dex.Marker):269:270 -> a
     3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):274:275 -> a
@@ -60800,122 +61024,122 @@
     13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):277 -> a
     14:17:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):291:294 -> a
     14:17:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):277 -> a
-    18:18:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> a
-    19:19:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> a
-    20:26:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):759:765 -> a
-    27:27:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):760:760 -> a
-    28:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):772:773 -> a
+    18:18:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):646:646 -> a
+    19:19:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):668:668 -> a
+    20:26:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):762:768 -> a
+    27:27:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):763:763 -> a
+    28:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):775:776 -> a
     30:30:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):775 -> a
-    31:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):775:777 -> a
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):778 -> a
+    31:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):778:780 -> a
     34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):778 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):778:778 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):781 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):781:781 -> a
     36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
-    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):781 -> a
-    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):781:781 -> a
-    38:38:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):773:773 -> a
-    39:42:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):786:789 -> a
-    43:47:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):794:798 -> a
-    48:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):803:809 -> a
-    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):804:804 -> a
-    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):808:808 -> a
-    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):895:900 -> a
-    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1076:1077 -> a
-    65:65:boolean canHaveArtCheckCastVerifierBug():1452:1452 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):654:657 -> b
+    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):784 -> a
+    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):784:784 -> a
+    38:38:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):776:776 -> a
+    39:42:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):789:792 -> a
+    43:47:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):797:801 -> a
+    48:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):806:812 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):807:807 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):811:811 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):898:903 -> a
+    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1079:1080 -> a
+    65:65:boolean canHaveArtCheckCastVerifierBug():1455:1455 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):657:660 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):659 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):659:661 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):657:657 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):655 -> b
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):662 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):662:664 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):660:660 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):646:646 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):658 -> b
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684:684 -> b
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682 -> b
-    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):683:685 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):686 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):690:691 -> b
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):685 -> b
+    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):686:688 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):668:668 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):689 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):693:694 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):693 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):693:693 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):753:753 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):695 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):695:695 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):691:691 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):797:797 -> b
-    25:26:boolean canHaveArtInstanceOfVerifierBug():1407:1408 -> b
-    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):647:650 -> c
-    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> c
-    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):648 -> c
-    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):669:669 -> c
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):696 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):696:696 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):756:756 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):698 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):698:698 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):694:694 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):800:800 -> b
+    25:26:boolean canHaveArtInstanceOfVerifierBug():1410:1411 -> b
+    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):650:653 -> c
+    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):646:646 -> c
+    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):651 -> c
+    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672:672 -> c
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
-    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670 -> c
-    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):671:671 -> c
-    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
-    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> c
-    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> c
-    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):753:753 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> c
-    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):788:788 -> c
-    14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1484:1484 -> c
+    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):673 -> c
+    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):674:674 -> c
+    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):668:668 -> c
+    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675 -> c
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> c
+    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):756:756 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> c
+    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):791:791 -> c
+    14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1487:1487 -> c
     1:1:boolean isGeneratingClassFiles():337:337 -> d
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1498 -> d
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1498:1498 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):699:701 -> d
-    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):715:720 -> d
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1501 -> d
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1501:1501 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):702:704 -> d
+    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):718:723 -> d
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> d
-    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):720 -> d
-    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):722:749 -> d
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):723 -> d
+    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):725:752 -> d
     1:1:boolean isGeneratingClassFiles():337:337 -> e
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1154 -> e
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1154:1154 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):708:710 -> e
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1157 -> e
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1157:1157 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):711:713 -> e
     1:1:boolean isGeneratingClassFiles():337:337 -> f
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1109 -> f
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1109:1109 -> f
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1112 -> f
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1112:1112 -> f
     1:1:boolean isGeneratingClassFiles():337:337 -> g
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1144 -> g
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1144:1144 -> g
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1147 -> g
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1147:1147 -> g
     1:1:boolean isGeneratingClassFiles():337:337 -> h
-    1:1:boolean canUseConstantMethodHandle():1089 -> h
-    2:2:boolean canUseConstantMethodHandle():1089:1089 -> h
+    1:1:boolean canUseConstantMethodHandle():1092 -> h
+    2:2:boolean canUseConstantMethodHandle():1092:1092 -> h
     1:1:boolean isGeneratingClassFiles():337:337 -> i
-    1:1:boolean canUseConstantMethodType():1093 -> i
-    2:2:boolean canUseConstantMethodType():1093:1093 -> i
+    1:1:boolean canUseConstantMethodType():1096 -> i
+    2:2:boolean canUseConstantMethodType():1096:1096 -> i
     1:1:boolean isGeneratingClassFiles():337:337 -> j
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1101 -> j
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1101:1101 -> j
-    1:2:boolean canUseFilledNewArrayOfObjects():1166:1167 -> k
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1104 -> j
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1104:1104 -> j
+    1:2:boolean canUseFilledNewArrayOfObjects():1169:1170 -> k
     1:1:boolean isGeneratingClassFiles():337:337 -> l
-    1:1:boolean canUseInvokeCustom():1097 -> l
-    2:2:boolean canUseInvokeCustom():1097:1097 -> l
+    1:1:boolean canUseInvokeCustom():1100 -> l
+    2:2:boolean canUseInvokeCustom():1100:1100 -> l
     1:1:boolean isGeneratingClassFiles():337:337 -> m
-    1:1:boolean canUseInvokePolymorphic():1085 -> m
-    2:2:boolean canUseInvokePolymorphic():1085:1085 -> m
+    1:1:boolean canUseInvokePolymorphic():1088 -> m
+    2:2:boolean canUseInvokePolymorphic():1088:1088 -> m
     1:1:boolean isGeneratingClassFiles():337:337 -> n
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1081 -> n
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1081:1081 -> n
-    1:2:boolean canUseMultidex():1135:1136 -> o
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1084 -> n
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1084:1084 -> n
+    1:2:boolean canUseMultidex():1138:1139 -> o
     1:1:boolean isGeneratingClassFiles():337:337 -> p
-    1:1:boolean canUseNotInstruction():1202 -> p
-    2:2:boolean canUseNotInstruction():1202:1202 -> p
+    1:1:boolean canUseNotInstruction():1205 -> p
+    2:2:boolean canUseNotInstruction():1205:1205 -> p
     1:1:boolean isGeneratingClassFiles():337:337 -> q
-    1:1:boolean canUsePrivateInterfaceMethods():1117 -> q
-    2:2:boolean canUsePrivateInterfaceMethods():1117:1117 -> q
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1175:1176 -> r
+    1:1:boolean canUsePrivateInterfaceMethods():1120 -> q
+    2:2:boolean canUsePrivateInterfaceMethods():1120:1120 -> q
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1178:1179 -> r
     1:1:boolean isGeneratingClassFiles():337:337 -> s
-    1:1:boolean canUseSuppressedExceptions():1140 -> s
-    2:2:boolean canUseSuppressedExceptions():1140:1140 -> s
+    1:1:boolean canUseSuppressedExceptions():1143 -> s
+    2:2:boolean canUseSuppressedExceptions():1143:1143 -> s
     1:1:boolean isGeneratingClassFiles():337:337 -> t
-    1:1:boolean canUseTwrCloseResourceMethod():1113 -> t
-    2:2:boolean canUseTwrCloseResourceMethod():1113:1113 -> t
-    1:4:void disableAllOptimizations():141:144 -> u
-    1:18:void disableGlobalOptimizations():148:165 -> v
-    1:1:void disableNameReflectionOptimization():1065:1065 -> w
-    1:2:void enablePropagationOfConstantsAtCallSites():1071:1072 -> x
+    1:1:boolean canUseTwrCloseResourceMethod():1116 -> t
+    2:2:boolean canUseTwrCloseResourceMethod():1116:1116 -> t
+    1:4:void disableAllOptimizations():140:143 -> u
+    1:18:void disableGlobalOptimizations():147:164 -> v
+    1:1:void disableNameReflectionOptimization():1068:1068 -> w
+    1:2:void enablePropagationOfConstantsAtCallSites():1074:1075 -> x
     1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304:304 -> y
     2:2:boolean hasConsumer():300:300 -> y
     2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> y
@@ -60929,42 +61153,42 @@
     8:8:boolean isGeneratingClassFiles():337:337 -> y
     8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():309 -> y
     9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():310:312 -> y
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():91:91 -> z
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.e0$a:
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():90:90 -> z
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.f0$a:
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):554:557 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.utils.e0$b:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):557:560 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.utils.f0$b:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():933:935 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.e0$c:
+    1:3:void <init>():936:938 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.f0$c:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():74:75 -> <clinit>
-    1:1:void <init>(java.lang.String,int):73:73 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.e0$d:
+    1:2:void <clinit>():73:74 -> <clinit>
+    1:1:void <init>(java.lang.String,int):72:72 -> <init>
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.f0$d:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():922:930 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.e0$e:
+    1:9:void <init>():925:933 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.f0$e:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():915:919 -> <clinit>
-    6:6:void <clinit>():913:913 -> <clinit>
-    1:1:void <init>(java.lang.String,int):913:913 -> <init>
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.utils.e0$f:
+    1:5:void <clinit>():918:922 -> <clinit>
+    6:6:void <clinit>():916:916 -> <clinit>
+    1:1:void <init>(java.lang.String,int):916:916 -> <init>
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.utils.f0$f:
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:13:void <init>():938:950 -> <init>
-    1:1:boolean isProtoShrinkingEnabled():953:953 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.e0$g:
+    1:13:void <init>():941:953 -> <init>
+    1:1:boolean isProtoShrinkingEnabled():956:956 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.f0$g:
     boolean enableSwitchToIfRewriting -> m
     boolean forceAssumeNoneInsertion -> o
     java.util.function.Consumer callSiteOptimizationInfoInspector -> N
@@ -61005,21 +61229,21 @@
     boolean deterministicSortingBasedOnDexType -> B
     boolean addCallEdgesForLibraryInvokes -> c
     boolean trackDesugaredAPIConversions -> D
-    1:100:void <init>():959:1058 -> <init>
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.e0$g$a:
+    1:100:void <init>():962:1061 -> <init>
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.f0$g$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1035:1037 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1041:1042 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1042:1042 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.e0$g$b:
+    1:3:void <init>():1038:1040 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1044:1045 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1045:1045 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.f0$g$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1052:1055 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.e0$h:
+    1:4:void <init>():1055:1058 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.f0$h:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):566:568 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.f0:
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):569:571 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.g0:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -61027,7 +61251,7 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.h0:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.i0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):20:20 -> a
@@ -61035,7 +61259,7 @@
     6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):103:115 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):53:55 -> b
     4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):80:83 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.g0:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.h0:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
@@ -61044,7 +61268,7 @@
     1:1:boolean hasNext():37:37 -> hasNext
     1:5:java.lang.Object next():42:46 -> next
     6:6:java.lang.Object next():44:44 -> next
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.j0:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.k0:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -61052,11 +61276,11 @@
     2:2:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     3:4:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.i0:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.j0:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.k0:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.l0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -61067,7 +61291,7 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.l0:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.m0:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):15:15 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):13:13 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13:13 -> a
@@ -61077,7 +61301,7 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.t0:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.u0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():60:60 -> <clinit>
     1:1:com.android.tools.r8.ir.code.Position access$900(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):60:60 -> a
@@ -61111,7 +61335,7 @@
     279:292:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):417:430 -> a
     293:293:void sortMethods(java.util.List):439:439 -> a
     294:295:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):441:442 -> a
-    296:296:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1200:1200 -> a
+    296:296:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1207:1207 -> a
     296:296:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):445 -> a
     297:297:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):466:466 -> a
     298:304:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):468:474 -> a
@@ -61126,7 +61350,7 @@
     327:332:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):513:518 -> a
     333:335:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):526:528 -> a
     1:4:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):683:686 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.m0:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.n0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
@@ -61144,11 +61368,11 @@
     20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):614:615 -> a
     22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):620:621 -> a
     1:3:void flushPc():560:562 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.n0:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.o0:
     1:1:void <init>():68:68 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):68:68 -> <init>
     1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):72:72 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.o0:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.p0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -61179,7 +61403,7 @@
     40:42:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):156 -> a
     43:53:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):157:167 -> a
     54:68:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):164:178 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.p0:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.q0:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -61190,7 +61414,7 @@
     1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> b
     1:1:int access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> c
     1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.r0:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -61200,7 +61424,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):82:82 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):78:86 -> <init>
     1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):91:105 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.r0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.s0:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -61218,13 +61442,13 @@
     3:15:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):205 -> a
     16:17:int getStartLine():242:243 -> a
     16:17:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):205 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.t0:
     com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.u0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.v0:
     1:1:java.lang.Object last(java.util.List):20:20 -> a
     2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):24:25 -> a
     4:6:java.util.List map(java.util.Collection,java.util.function.Function):33:35 -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.w0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -61240,7 +61464,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.x0:
     1:9:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:29 -> a
     10:10:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -61255,7 +61479,7 @@
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     33:33:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     34:34:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.x0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.y0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -61269,7 +61493,7 @@
     1:1:int doHash(java.lang.Object):15:15 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexMethod):47:50 -> doHash
     2:5:int doHash(java.lang.Object):15 -> doHash
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.y0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.z0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -61283,14 +61507,14 @@
     1:1:int doHash(java.lang.Object):14:14 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexMethod):45:48 -> doHash
     2:5:int doHash(java.lang.Object):14 -> doHash
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.z0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.A0:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
     1:1:void <clinit>():11:11 -> <clinit>
     2:2:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.B0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -61303,7 +61527,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> 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.OptionalBool -> com.android.tools.r8.utils.E0:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.utils.F0:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> e
     com.android.tools.r8.utils.OptionalBool TRUE -> c
     com.android.tools.r8.utils.OptionalBool FALSE -> d
@@ -61313,16 +61537,16 @@
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):54:54 -> a
     1:1:com.android.tools.r8.utils.OptionalBool unknown():58:58 -> g
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.B0:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.C0:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> e
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.D0:
     1:1:void <init>():24:24 -> <init>
     boolean isFalse() -> c
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.D0:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.E0:
     1:1:void <init>():38:38 -> <init>
     boolean isUnknown() -> f
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.F0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.G0:
     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
@@ -61330,14 +61554,14 @@
     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
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.F0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.G0$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     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.OrderedMergingIterator -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.H0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -61360,14 +61584,14 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.H0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.I0:
     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
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.J0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -61377,7 +61601,7 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.K0:
     java.util.Map content -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.PreloadedClassFileProvider$1):19:19 -> <init>
     2:3:void <init>(java.util.Map):37:38 -> <init>
@@ -61387,8 +61611,8 @@
     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$1 -> com.android.tools.r8.utils.J0$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.J0$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.utils.K0$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.K0$b:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -61397,11 +61621,11 @@
     3:3:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.J0$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.K0$c:
     java.lang.String descriptor -> a
     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.utils.K0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.L0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():21:21 -> <clinit>
@@ -61439,7 +61663,7 @@
     6:8:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> b
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():60:60 -> c
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.L0:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.M0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -61461,9 +61685,9 @@
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.L0$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.M0$a:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.utils.M0:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.utils.N0:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -61476,9 +61700,9 @@
     5:44:com.android.tools.r8.utils.SegmentTree add(int,int,java.lang.Object):36:75 -> a
     45:48:boolean lambda$add$0(int,int,com.android.tools.r8.utils.Box,java.lang.Integer):43:46 -> a
     49:49:int size():80:80 -> a
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.N0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.O0:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.O0:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.P0:
     1:2:byte[] StreamToByteArrayClose(java.io.InputStream):16:17 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> a
@@ -61490,7 +61714,7 @@
     1:1:java.lang.String getDiagnosticMessage():53:53 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.P0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.Q0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -61511,13 +61735,14 @@
     37:39:java.lang.String join(java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType,java.util.function.Function):137:139 -> a
     40:44:java.lang.String lines(java.util.List):143:147 -> a
     45:45:java.lang.String joinLines(java.lang.String[]):165:165 -> a
-    46:46:java.lang.String hexString(int,int):215:215 -> a
-    47:55:java.lang.String hexString(int,int,boolean):219:227 -> a
-    56:64:java.lang.String hexString(long,int,boolean):236:244 -> a
-    56:64:java.lang.String hexString(long,int):232 -> a
-    65:69:java.lang.String times(java.lang.String,int):263:267 -> a
-    70:70:boolean isWhitespace(int):275:275 -> a
-    71:76:int firstNonWhitespaceCharacter(java.lang.String):323:328 -> a
+    46:46:java.lang.String joinLines(java.util.Collection):169:169 -> a
+    47:47:java.lang.String hexString(int,int):215:215 -> a
+    48:56:java.lang.String hexString(int,int,boolean):219:227 -> a
+    57:65:java.lang.String hexString(long,int,boolean):236:244 -> a
+    57:65:java.lang.String hexString(long,int):232 -> a
+    66:70:java.lang.String times(java.lang.String,int):263:267 -> a
+    71:71:boolean isWhitespace(int):275:275 -> a
+    72:77:int firstNonWhitespaceCharacter(java.lang.String):323:328 -> a
     1:3:java.lang.StringBuilder appendRightPadded(java.lang.StringBuilder,java.lang.String,int):96:98 -> b
     4:4:java.lang.String lines(java.lang.String[]):151:151 -> b
     5:5:java.lang.String zeroPrefix(int,int):197:197 -> b
@@ -61528,7 +61753,7 @@
     1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> e
     1:9:java.lang.String trim(java.lang.String):288:296 -> f
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):155:159 -> g
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.P0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.Q0$a:
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> b
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> c
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> a
@@ -61537,7 +61762,7 @@
     1:4:void <clinit>():22:25 -> <clinit>
     5:5:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.Q0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.R0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -61546,12 +61771,12 @@
     1:15:void <clinit>():13:27 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.Q0$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.R0$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.R0:
+com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.S0:
     1:9:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):21:29 -> a
     10:10:java.lang.Object lambda$processItems$0(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object):25:25 -> a
     11:24:void awaitFutures(java.lang.Iterable):34:47 -> a
@@ -61559,27 +61784,27 @@
     36:37:java.util.concurrent.ExecutorService getExecutorService(int):64:65 -> a
     38:38:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):69:69 -> a
     1:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):57:58 -> b
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.S0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.T0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.T0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.U0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.U0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.V0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.V0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.W0:
     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
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.W0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.X0:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.X0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.Y0:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:4:java.lang.Object computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):18:21 -> a
     5:10:java.util.List take(int):25:30 -> a
     11:11:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.Y0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.Z0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.Z0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.a1:
     java.util.Stack stack -> a
     boolean trackMemory -> b
     1:1:void <init>():27:27 -> <init>
@@ -61613,10 +61838,10 @@
     12:12:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
     13:13:java.util.Map computeMemoryInformation():211:211 -> b
     13:13:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.Z0$a:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.a1$a:
     long used -> a
     1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.Z0$b:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.a1$b:
     com.android.tools.r8.utils.Timing this$0 -> g
     java.util.Map children -> b
     java.lang.String title -> a
@@ -61663,9 +61888,9 @@
     3:3:java.lang.String com.android.tools.r8.utils.Timing.access$200(long):21 -> toString
     3:3:java.lang.String toString():96 -> toString
     4:4:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.a1:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.b1:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.b1:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.c1:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -61684,7 +61909,7 @@
     2:2: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.ZipUtils -> com.android.tools.r8.utils.c1:
+com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.d1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
     boolean lambda$unzip$1(java.util.zip.ZipEntry) -> a
@@ -61708,5 +61933,5 @@
     84:96:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):127:139 -> a
     97:104:boolean isClassFile(java.lang.String):148:155 -> a
     1:2:boolean isDexFile(java.lang.String):143:144 -> b
-com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.c1$a:
+com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.d1$a:
     void onEntry(java.util.zip.ZipEntry,java.io.InputStream) -> a