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 rewriteCurrentInstructi