Update D8 and R8 to 2.0.12-dev

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

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

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I6831abacb9047a7db6d7f3c5e631a97fac5b4e9a
diff --git a/r8.jar b/r8.jar
index e260111..4dda0c7 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 70d1646..e2e3d4b 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 2.0.10-dev
+# compiler_version: 2.0.12-dev
 # compiler_hash: engineering
-# pg_map_id: a0bd12f
+# pg_map_id: 5553c36
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -71,6 +71,70 @@
     1:1:boolean includeDexEntries(java.lang.String):47:47 -> includeDexEntries
 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$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
+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.BaseCommand -> com.android.tools.r8.BaseCommand:
     com.android.tools.r8.utils.AndroidApp app -> c
     boolean printHelp -> a
@@ -157,7 +221,8 @@
 com.android.tools.r8.BaseCommand$ProgramInputOrigin -> com.android.tools.r8.BaseCommand$c:
     1:1:void <init>(java.nio.file.Path):86:86 -> <init>
 com.android.tools.r8.BaseCompilerCommand -> com.android.tools.r8.BaseCompilerCommand:
-    boolean $assertionsDisabled -> n
+    boolean $assertionsDisabled -> o
+    com.android.tools.r8.AssertionsConfiguration assertionsConfiguration -> n
     com.android.tools.r8.utils.Reporter reporter -> i
     boolean enableDesugaring -> j
     int minApiLevel -> h
@@ -167,83 +232,88 @@
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
     com.android.tools.r8.CompilationMode mode -> e
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:10:void <init>(boolean,boolean):43:52 -> <init>
-    11:22: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):66:77 -> <init>
+    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>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.Reporter getReporter():133:133 -> b
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():121:121 -> getDexClassChecksumFilter
-    1:1:boolean getEnableDesugaring():111:111 -> getEnableDesugaring
-    1:1:boolean getIncludeClassesChecksum():116:116 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():106:106 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():90:90 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():85:85 -> getMode
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():99:99 -> getProgramConsumer
-    1:1:boolean isOptimizeMultidexForLinearAlloc():129:129 -> isOptimizeMultidexForLinearAlloc
+    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
 com.android.tools.r8.BaseCompilerCommand$Builder -> com.android.tools.r8.BaseCompilerCommand$Builder:
     boolean includeClassesChecksum -> n
     java.util.function.BiPredicate dexClassChecksumFilter -> p
     boolean optimizeMultidexForLinearAlloc -> o
     java.nio.file.Path outputPath -> h
     int minApiLevel -> k
-    com.android.tools.r8.CompilationMode mode -> j
     boolean disableDesugaring -> l
+    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
-    com.android.tools.r8.OutputMode outputMode -> i
-    boolean $assertionsDisabled -> q
     java.util.List desugaredLibraryConfigurationResources -> m
-    1:1:void <clinit>():143:143 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):169:169 -> <init>
-    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):147:170 -> <init>
-    26:26:void <init>(com.android.tools.r8.utils.AndroidApp):175:175 -> <init>
-    27:56:void <init>(com.android.tools.r8.utils.AndroidApp):147:176 -> <init>
-    57:57:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):181:181 -> <init>
-    58:93:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):147:182 -> <init>
+    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>
     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):348:380 -> a
-    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):450:461 -> a
-    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> 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
     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):454 -> a
+    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468 -> 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):454 -> a
-    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:438 -> addDesugaredLibraryConfiguration
-    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:439 -> addDesugaredLibraryConfiguration
-    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):444:445 -> addDesugaredLibraryConfiguration
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):431:431 -> addSpecialLibraryConfiguration
-    1:29:void validate():481:509 -> e
+    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
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> f
-    1:1:boolean hasDesugaredLibraryConfiguration():465:465 -> g
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():243:243 -> getDexClassChecksumFilter
-    1:1:boolean getDisableDesugaring():426:426 -> getDisableDesugaring
-    1:1:boolean getIncludeClassesChecksum():476:476 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():236:236 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():385:385 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():189:189 -> getMode
-    1:1:com.android.tools.r8.OutputMode getOutputMode():218:218 -> getOutputMode
-    1:1:java.nio.file.Path getOutputPath():208:208 -> getOutputPath
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():229:229 -> getProgramConsumer
-    1:1:boolean isMinApiLevelSet():389:389 -> h
-    1:1:boolean isOptimizeMultidexForLinearAlloc():261:261 -> i
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):339:341 -> setDexClassChecksumFilter
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):420:421 -> setDisableDesugaring
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):404:405 -> setEnableDesugaring
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):470:471 -> setIncludeClassesChecksum
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):304:305 -> setMainDexListConsumer
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):291:292 -> setMainDexListOutputPath
-    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):395:399 -> setMinApiLevel
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):196:198 -> setMode
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):252:253 -> setOptimizeMultidexForLinearAlloc
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):319:319 -> setOutput
-    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):324:329 -> setOutput
-    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):275:278 -> setProgramConsumer
+    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
 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):355:355 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):369:369 -> <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):362:362 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):376:376 -> <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
@@ -308,9 +378,6 @@
     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>
@@ -337,13 +404,13 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):243:245 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):370:370 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):371:371 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):245 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246:250 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:143 -> c
     1:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:176 -> d
-    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):366:366 -> d
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):367:367 -> d
     28:28:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     29:39:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     40:44:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -357,63 +424,63 @@
     11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
     11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):99 -> run
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
-    com.android.tools.r8.graph.DexItemFactory factory -> s
-    boolean intermediate -> o
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> r
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> p
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> q
-    java.lang.String USAGE_MESSAGE -> t
-    1:194:void <clinit>():32:225 -> <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.graph.DexItemFactory,com.android.tools.r8.D8Command$1):33:33 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):33:33 -> <init>
-    3:18: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.graph.DexItemFactory):289:304 -> <init>
-    19:24:void <init>(boolean,boolean):308:313 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):243:243 -> a
-    2:42:com.android.tools.r8.utils.InternalOptions getInternalOptions():318:358 -> a
-    1:1:com.android.tools.r8.D8Command$Builder builder():234:234 -> builder
-    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):238:238 -> builder
-    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):256:256 -> parse
-    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):270:270 -> parse
+    com.android.tools.r8.graph.DexItemFactory factory -> t
+    boolean intermediate -> p
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> q
+    boolean $assertionsDisabled -> v
+    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
 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 -> s
-    boolean intermediate -> r
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> t
-    1:1:void <init>(com.android.tools.r8.D8Command$1):65:65 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):65:65 -> <init>
-    3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):65:65 -> <init>
-    4:4:void <init>():72:72 -> <init>
-    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):76:76 -> <init>
-    6:8:void <init>(com.android.tools.r8.DiagnosticsHandler):67:69 -> <init>
-    9:9:void <init>(com.android.tools.r8.utils.AndroidApp):80:80 -> <init>
-    10:12:void <init>(com.android.tools.r8.utils.AndroidApp):67:69 -> <init>
-    1:1:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):88:88 -> a
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):64:64 -> addClasspathFiles
-    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):64:64 -> addClasspathFiles
-    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):97:97 -> addClasspathFiles
-    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):105:105 -> addClasspathFiles
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):64:64 -> addClasspathResourceProvider
-    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):113:113 -> addClasspathResourceProvider
-    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):64:64 -> addDexProgramData
-    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):88:88 -> addDexProgramData
-    1:1:com.android.tools.r8.BaseCommand makeCommand():64:64 -> c
-    2:24:com.android.tools.r8.D8Command makeCommand():196:218 -> c
-    25:25:com.android.tools.r8.D8Command makeCommand():197:197 -> c
+    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
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:19:void validate():166:184 -> e
-    20:29:void validate():182:191 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():161:161 -> f
-    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():141:141 -> getDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):150:150 -> setDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):133:133 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):122:122 -> setIntermediate
+    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
 com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.D8Command$b:
-    1:1:void <init>():42:42 -> <init>
-    2:2:void <init>(com.android.tools.r8.D8Command$1):42:42 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):46:51 -> error
-    7:13:void error(com.android.tools.r8.Diagnostic):49:55 -> error
-com.android.tools.r8.D8CommandParser -> com.android.tools.r8.d:
+    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:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:96:void <clinit>():26:121 -> <clinit>
@@ -431,8 +498,8 @@
     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.d$a:
-com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.d$b:
+com.android.tools.r8.D8CommandParser$1 -> com.android.tools.r8.c$a:
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.c$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>
@@ -442,7 +509,7 @@
     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.d$b$a:
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.c$b$a:
     boolean empty -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder -> a
     1:4:void <init>():47:50 -> <init>
@@ -522,7 +589,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.e:
+com.android.tools.r8.DexFileMergerHelper -> com.android.tools.r8.d:
     java.util.Map inputOrdering -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():28:28 -> <clinit>
@@ -534,10 +601,10 @@
     5:45:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):74:114 -> a
     46:51:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):109:114 -> a
     52:54:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):120:122 -> a
-    55:55:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    55:55:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     55:55:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):38 -> a
     56:56:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):38:38 -> a
-    57:57:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    57:57:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     57:57:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39 -> a
     58:75:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39:56 -> a
     76:87:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):43:54 -> a
@@ -696,10 +763,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.f:
+com.android.tools.r8.Disassemble -> com.android.tools.r8.e:
     1:18:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):219:236 -> a
-com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.f$a:
-com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.f$b:
+com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.e$a:
+com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.e$b:
     java.nio.file.Path outputPath -> e
     boolean useIr -> i
     com.android.tools.r8.StringResource proguardMap -> f
@@ -716,7 +783,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.f$b$a:
+com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.e$b$a:
     boolean allInfo -> i
     java.nio.file.Path proguardMapFile -> g
     java.nio.file.Path outputPath -> f
@@ -753,7 +820,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.h:
+com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.g:
     java.lang.String USAGE_MESSAGE -> g
     java.util.List programFiles -> f
     boolean csv -> e
@@ -783,8 +850,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.g:
-com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.h$a:
+com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.f:
+com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.g$a:
     java.util.List programFiles -> f
     boolean csv -> e
     boolean printHelp -> a
@@ -821,7 +888,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.i:
+com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.h:
     com.android.tools.r8.utils.InternalOptions options -> c
     java.util.Set parallelMethods -> f
     boolean $assertionsDisabled -> g
@@ -869,7 +936,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.i$a:
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.h$a:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
     1:3:void <init>(java.util.Set,java.util.Map):190:192 -> <init>
@@ -884,7 +951,7 @@
     59:59:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):72:72 -> a
     60:64:java.lang.Iterable lambda$run$2(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):84:88 -> a
     65:67:void lambda$run$3(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):154:156 -> a
-    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     68:68:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):90 -> a
     69:70:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):91:92 -> a
     1:13:void main(java.lang.String[]):163:175 -> main
@@ -940,7 +1007,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.j:
+com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.i:
 com.android.tools.r8.JdkClassFileProvider -> com.android.tools.r8.JdkClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Map descriptorToModule -> c
@@ -982,7 +1049,7 @@
     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
-    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():357:357 -> 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
@@ -994,61 +1061,62 @@
     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
 com.android.tools.r8.L8Command -> com.android.tools.r8.L8Command:
-    com.android.tools.r8.graph.DexItemFactory factory -> r
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> q
-    com.android.tools.r8.R8Command r8Command -> p
-    com.android.tools.r8.D8Command d8Command -> o
-    boolean $assertionsDisabled -> s
-    1:1:void <clinit>():23:23 -> <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):24:24 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):24:24 -> <init>
-    3:17: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):54:68 -> <init>
-    18:22:void <init>(boolean,boolean):72:76 -> <init>
+    com.android.tools.r8.graph.DexItemFactory factory -> s
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> r
+    com.android.tools.r8.D8Command d8Command -> p
+    boolean $assertionsDisabled -> 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>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:37:com.android.tools.r8.utils.InternalOptions getInternalOptions():105:141 -> a
-    1:1:com.android.tools.r8.L8Command$Builder builder():96:96 -> builder
-    2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):100:100 -> builder
-    1:1:com.android.tools.r8.D8Command getD8Command():36:36 -> c
-    1:1:com.android.tools.r8.R8Command getR8Command():40:40 -> d
-    1:1:boolean isShrinking():32:32 -> e
+    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
 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 proguardConfigStrings -> r
-    java.util.List proguardConfigFiles -> s
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):152:152 -> <init>
-    2:2:void <init>(com.android.tools.r8.L8Command$1):152:152 -> <init>
-    3:3:void <init>():158:158 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):162:162 -> <init>
-    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):154:155 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):194:194 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):182:182 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):188:188 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():220:224 -> c
-    1:5:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():225 -> c
-    6:6:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    7:35:com.android.tools.r8.L8Command makeCommand():225:253 -> c
-    7:35:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    36:61:com.android.tools.r8.L8Command makeCommand():252:277 -> c
-    36:61:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    62:62:com.android.tools.r8.L8Command makeCommand():221:221 -> c
-    62:62:com.android.tools.r8.BaseCommand makeCommand():151 -> c
+    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
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:16:void validate():200:215 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> f
-    1:1:boolean isShrinking():167:167 -> isShrinking
+    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
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
-    1:1:void <init>():79:79 -> <init>
-    1:5:void error(com.android.tools.r8.Diagnostic):83:87 -> error
-    6:12:void error(com.android.tools.r8.Diagnostic):85:91 -> error
+    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
 com.android.tools.r8.L8Command$DesugaredLibrary -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():283:285 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):291:293 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):292:292 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):291:291 -> accept
-    1:1:java.util.Collection getProgramResources():298:298 -> getProgramResources
+    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
 com.android.tools.r8.OutputMode -> com.android.tools.r8.OutputMode:
     com.android.tools.r8.OutputMode[] $VALUES -> a
     1:16:void <clinit>():11:26 -> <clinit>
@@ -1095,174 +1163,175 @@
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():139:139 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.utils.InternalOptions):145:151 -> <init>
-    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):184:184 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    2:2:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):582 -> a
-    3:4:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):583:584 -> a
-    5:6:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):198:199 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    7:7:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):200 -> a
-    8:8:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):201:201 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():357:357 -> a
-    9:9:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):203 -> a
-    10:23:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):203:216 -> a
-    24:25:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):222:223 -> a
-    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):229:230 -> a
+    1:1:void <clinit>():138:138 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.utils.InternalOptions):144:150 -> <init>
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:183 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    2:2:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):575 -> a
+    3:4:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):576:577 -> a
+    5:6:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):197:198 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    7:7:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):199 -> a
+    8:8:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):200:200 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():349:349 -> a
+    9:9:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):202 -> a
+    10:23:void writeApplication(java.util.concurrent.ExecutorService,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,com.android.tools.r8.naming.ProguardMapSupplier):202:215 -> a
+    24:25:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):221:222 -> a
+    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):228:229 -> a
     28:28:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
-    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):230 -> a
-    29:55:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):247:273 -> a
-    56:86:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):272:302 -> a
-    87:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301:305 -> a
-    92:92:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):304:304 -> a
-    93:104:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:314 -> a
-    105:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):313:315 -> a
-    108:135:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):309:336 -> a
-    136:160:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):335:359 -> a
-    161:161:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):356:356 -> a
-    162:213:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):352:403 -> a
-    214:236:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):402:424 -> a
-    237:261:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):421:445 -> a
-    262:281:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):442:461 -> a
-    282:296:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):458:472 -> a
-    297:306:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):469:478 -> a
-    307:319:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):475:487 -> a
-    320:328:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):485:493 -> a
-    329:379:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):490:540 -> a
-    380:384:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):536:540 -> a
-    385:469:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):534:618 -> a
-    470:470:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):616:616 -> a
-    471:489:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):615:633 -> a
-    490:506:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):631:647 -> a
-    507:507:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):644:644 -> a
-    508:523:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):641:656 -> a
-    524:579:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):655:710 -> a
-    580:675:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):709:804 -> a
-    676:705:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):749:778 -> a
-    706:706:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):774:774 -> a
-    707:727:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):772:792 -> a
-    728:745:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):787:804 -> a
-    746:746:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):676:676 -> a
-    747:747:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):519:519 -> a
-    748:1181:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):371:804 -> a
-    1182:1183:void lambda$run$2(com.android.tools.r8.graph.DexType):277:278 -> a
-    1184:1184:void lambda$run$2(com.android.tools.r8.graph.DexType):277:277 -> a
-    1185:1185:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):345:345 -> a
-    1186:1190:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):576:580 -> a
-    1191:1191:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$7(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):632:632 -> a
-    1192:1192:java.lang.Iterable lambda$run$8(com.android.tools.r8.graph.AppView):657:657 -> a
-    1193:1193:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):688:688 -> a
-    1194:1194:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):696:696 -> a
-    1195:1195:void lambda$run$11(java.lang.String):743:743 -> a
-    1196:1196:void lambda$run$12(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):754:754 -> a
-    1197:1197:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):766:766 -> a
-    1198:1206:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):811:819 -> a
-    1207:1215:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):817:825 -> a
-    1216:1216:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):823:823 -> a
-    1217:1217:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):822:822 -> a
-    1218:1220:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):842:844 -> a
-    1221:1243:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):843:865 -> a
-    1244:1255:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):863:874 -> a
-    1256:1261:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):873:878 -> a
-    1262:1267:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):876:881 -> a
-    1268:1268:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1268:1268:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):881 -> a
-    1269:1269:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1269:1269:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1269:1269:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):881 -> a
-    1270:1270:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):881:881 -> a
-    1271:1277:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):885:891 -> a
-    1278:1281:boolean verifyNoJarApplicationReaders(java.util.List):896:899 -> a
-    1282:1282:void lambda$run$14(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):921:921 -> a
-    1283:1283:void lambda$main$15(java.lang.String[]):937:937 -> a
+    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):229 -> a
+    29:55:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):246:272 -> a
+    56:86:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):271:301 -> a
+    87:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300:304 -> a
+    92:92:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:303 -> a
+    93:104:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):302:313 -> a
+    105:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):312:314 -> a
+    108:129:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):308:329 -> a
+    130:154:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):328:352 -> a
+    155:155:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):349:349 -> a
+    156:207:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):345:396 -> a
+    208:230:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):395:417 -> a
+    231:255:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):414:438 -> a
+    256:275:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):435:454 -> a
+    276:290:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):451:465 -> a
+    291:300:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):462:471 -> a
+    301:313:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):468:480 -> a
+    314:322:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):478:486 -> a
+    323:373:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):483:533 -> a
+    374:378:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):529:533 -> a
+    379:463:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):527:611 -> a
+    464:464:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):609:609 -> a
+    465:483:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):608:626 -> a
+    484:500:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):624:640 -> a
+    501:501:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):637:637 -> a
+    502:517:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):634:649 -> a
+    518:573:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):648:703 -> a
+    574:670:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):702:798 -> a
+    671:700:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):743:772 -> a
+    701:701:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):768:768 -> a
+    702:722:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):766:786 -> a
+    723:740:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):781:798 -> a
+    741:741:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):669:669 -> a
+    742:742:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):512:512 -> a
+    743:1177:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):364:798 -> a
+    1178:1179:void lambda$run$2(com.android.tools.r8.graph.DexType):276:277 -> a
+    1180:1180:void lambda$run$2(com.android.tools.r8.graph.DexType):276:276 -> a
+    1181:1181:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):338:338 -> a
+    1182:1186:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):569:573 -> a
+    1187:1187:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$7(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):625:625 -> a
+    1188:1188:java.lang.Iterable lambda$run$8(com.android.tools.r8.graph.AppView):650:650 -> a
+    1189:1189:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):681:681 -> a
+    1190:1190:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):689:689 -> a
+    1191:1191:void lambda$run$11(java.lang.String):737:737 -> a
+    1192:1192:void lambda$run$12(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):748:748 -> a
+    1193:1193:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):760:760 -> a
+    1194:1202:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):805:813 -> a
+    1203:1211:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):811:819 -> a
+    1212:1212:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):817:817 -> a
+    1213:1213:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):816:816 -> a
+    1214:1216:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):836:838 -> a
+    1217:1239:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):837:859 -> a
+    1240:1251:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):857:868 -> a
+    1252:1257:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):867:872 -> a
+    1258:1263:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):870:875 -> a
+    1264:1264:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1264:1264:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):875 -> a
+    1265:1265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1265:1265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1265:1265:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):875 -> a
+    1266:1266:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):875:875 -> a
+    1267:1273:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):879:885 -> a
+    1274:1277:boolean verifyNoJarApplicationReaders(java.util.List):890:893 -> a
+    1278:1278:void lambda$run$14(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):915:915 -> a
+    1279:1279:void lambda$main$15(java.lang.String[]):931:931 -> a
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> b
-    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):234:236 -> b
-    4:5:void run(java.lang.String[]):907:908 -> b
+    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):233:235 -> b
+    4:5:void run(java.lang.String[]):901:902 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):909 -> b
-    7:7:void run(java.lang.String[]):910:910 -> b
+    6:6:void run(java.lang.String[]):903 -> b
+    7:7:void run(java.lang.String[]):904:904 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    8:8:void run(java.lang.String[]):909 -> b
-    9:16:void run(java.lang.String[]):913:920 -> b
+    8:8:void run(java.lang.String[]):903 -> b
+    9:16:void run(java.lang.String[]):907:914 -> b
     17:17:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> b
-    17:17:void run(java.lang.String[]):920 -> b
-    18:18:void run(java.lang.String[]):923:923 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):243:243 -> c
-    1:5:void main(java.lang.String[]):933:937 -> main
-    1:3:void run(com.android.tools.r8.R8Command):163:165 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):179:182 -> run
+    17:17:void run(java.lang.String[]):914 -> b
+    18:18:void run(java.lang.String[]):917:917 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):242:242 -> c
+    1:5:void main(java.lang.String[]):927:931 -> main
+    1:3:void run(com.android.tools.r8.R8Command):162:164 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):178:181 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):181 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):180 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
-    java.util.List mainDexKeepRules -> o
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> w
-    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> x
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> u
-    com.android.tools.r8.StringConsumer proguardUsageConsumer -> v
-    com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> D
-    boolean enableTreeShaking -> q
-    boolean enableMinification -> r
-    boolean disableVerticalClassMerging -> s
-    boolean forceProguardCompatibility -> t
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> y
-    com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> p
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> z
-    java.util.function.Consumer syntheticProguardRulesConsumer -> A
-    boolean $assertionsDisabled -> F
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> C
-    java.lang.String USAGE_MESSAGE -> E
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> B
-    1:574:void <clinit>():56:629 -> <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.R8Command$1):57:57 -> <init>
+    java.lang.String USAGE_MESSAGE -> F
+    java.util.List mainDexKeepRules -> p
+    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> y
+    boolean forceProguardCompatibility -> u
+    com.android.tools.r8.StringConsumer proguardUsageConsumer -> w
+    com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> E
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> x
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> v
+    boolean enableTreeShaking -> r
+    boolean enableMinification -> s
+    boolean disableVerticalClassMerging -> t
+    com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> q
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> z
+    java.util.function.Consumer syntheticProguardRulesConsumer -> B
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> A
+    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:31: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):722:750 -> <init>
-    32:48:void <init>(boolean,boolean):754:770 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):660:660 -> a
-    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):665:665 -> a
-    3:55:com.android.tools.r8.utils.InternalOptions getInternalOptions():785:837 -> a
-    56:66:com.android.tools.r8.utils.InternalOptions getInternalOptions():834:844 -> a
-    67:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():841:851 -> a
-    78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():848:858 -> a
-    89:106:com.android.tools.r8.utils.InternalOptions getInternalOptions():855:872 -> a
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    107:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():873 -> a
-    108:108:com.android.tools.r8.utils.InternalOptions getInternalOptions():874:874 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    109:109:com.android.tools.r8.utils.InternalOptions getInternalOptions():880 -> a
-    110:124:com.android.tools.r8.utils.InternalOptions getInternalOptions():881:895 -> a
-    125:127:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):904:906 -> a
-    1:1:com.android.tools.r8.R8Command$Builder builder():650:650 -> builder
+    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():650 -> builder
-    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):655:655 -> builder
-    1:1:boolean getEnableMinification():780:780 -> getEnableMinification
-    1:1:boolean getEnableTreeShaking():775:775 -> getEnableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):678:678 -> parse
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):692:692 -> parse
+    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
 com.android.tools.r8.R8Command$1 -> com.android.tools.r8.R8Command$a:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
-    java.util.List mainDexRules -> r
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> F
-    boolean $assertionsDisabled -> I
-    java.util.function.Consumer syntheticProguardRulesConsumer -> t
-    java.util.List proguardConfigs -> v
-    java.util.function.Consumer proguardConfigurationConsumerForTesting -> s
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> u
-    boolean disableTreeShaking -> w
-    boolean disableMinification -> x
-    boolean disableVerticalClassMerging -> y
-    boolean forceProguardCompatibility -> z
-    java.util.List featureSplits -> G
-    boolean allowTestProguardOptions -> H
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> C
-    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> D
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> E
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> A
-    com.android.tools.r8.StringConsumer proguardUsageConsumer -> B
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> F
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> G
+    java.util.function.Consumer proguardConfigurationConsumerForTesting -> t
+    boolean allowTestProguardOptions -> I
+    boolean $assertionsDisabled -> J
+    java.util.List mainDexRules -> s
+    java.util.function.Consumer syntheticProguardRulesConsumer -> u
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> v
+    java.util.List proguardConfigs -> w
+    boolean disableTreeShaking -> x
+    boolean disableMinification -> y
+    boolean disableVerticalClassMerging -> z
+    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> E
+    java.util.List featureSplits -> H
+    boolean forceProguardCompatibility -> A
+    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>
@@ -1281,8 +1350,8 @@
     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):572:573 -> a
-    17:19:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):576:578 -> 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
     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
@@ -1300,7 +1369,7 @@
     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):585:587 -> 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
@@ -1309,9 +1378,9 @@
     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():598:598 -> k
+    1:1:void allowTestProguardOptions():599:599 -> k
     1:1:void internalForceProguardCompatibility():127:127 -> l
-    1:113:com.android.tools.r8.R8Command makeR8Command():450:562 -> m
+    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
@@ -1345,13 +1414,13 @@
     7:14:void error(com.android.tools.r8.Diagnostic):74:81 -> 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):607:608 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():625:625 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():613:616 -> getProgramResources
+    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
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):915:915 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):920:921 -> accept
-com.android.tools.r8.R8CommandParser -> com.android.tools.r8.m:
+    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:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:47:void <clinit>():18:64 -> <clinit>
@@ -1366,8 +1435,8 @@
     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.k:
-com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.l:
+com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.j:
+com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.k:
     java.nio.file.Path outputPath -> c
     com.android.tools.r8.OutputMode outputMode -> b
     boolean includeDataResources -> e
@@ -1553,14 +1622,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.n:
+com.android.tools.r8.StringResource -> com.android.tools.r8.m:
     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.n$a:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.n$b:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.m$a:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.m$b:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -1570,7 +1639,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.n$c:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.m$c:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -1591,20 +1660,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.o.a:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.n.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.o.a$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.n.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.o.b:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.n.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.o.c:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.n.c:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -1683,7 +1752,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.o.c$a:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.n.c$a:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -1697,14 +1766,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.o.c$b:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.n.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.p.a:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.o.a:
     boolean pendingComma -> o
     java.util.Set imports -> j
     java.lang.StringBuilder builder -> p
@@ -1822,7 +1891,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.p.b:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.o.b:
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
     boolean $assertionsDisabled -> i
@@ -1964,7 +2033,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.p.d:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.o.d:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -2059,12 +2128,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.p.c:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.o.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.p.e:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.o.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
@@ -2074,7 +2143,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.p.g:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.o.g:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -2151,11 +2220,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.p.f:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.o.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.p.m:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.o.m:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -2170,14 +2239,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():211:211 -> a
+    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():217:217 -> 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():195:195 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():201:201 -> 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():199:199 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():205:205 -> 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():203:203 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():209:209 -> 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
@@ -2208,8 +2277,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.p.h:
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.p.i:
+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.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2217,7 +2286,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.p.j:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.o.j:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2227,7 +2296,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.p.k:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.o.k:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -2238,9 +2307,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.p.l:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.o.l:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.p.n.a:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.o.n.a:
     com.android.tools.r8.ir.code.NumericType type -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> a
     boolean $assertionsDisabled -> c
@@ -2277,17 +2346,17 @@
     48:48:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):156:156 -> a
     49:49:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):153:153 -> a
     50:50:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:150 -> a
-    1:1:boolean canThrow():139:139 -> g
-    1:13:int getAsmOpcode():98:110 -> t
-    14:14:int getAsmOpcode():108:108 -> t
-    15:15:int getAsmOpcode():106:106 -> t
-    16:16:int getAsmOpcode():104:104 -> t
-    17:17:int getAsmOpcode():102:102 -> t
-    18:18:int getAsmOpcode():100:100 -> t
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():43:43 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getType():47:47 -> v
-    1:1:int getAsmOpcodeTypeOffset():115:115 -> w
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.p.n.a$a:
+    1:1:boolean canThrow():139:139 -> e
+    1:13:int getAsmOpcode():98:110 -> q
+    14:14:int getAsmOpcode():108:108 -> q
+    15:15:int getAsmOpcode():106:106 -> q
+    16:16:int getAsmOpcode():104:104 -> q
+    17:17:int getAsmOpcode():102:102 -> q
+    18:18:int getAsmOpcode():100:100 -> q
+    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[] $VALUES -> f
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> a
@@ -2297,7 +2366,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.p.n.b:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.o.n.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -2307,8 +2376,8 @@
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):41:41 -> a
     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() -> g
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.p.n.c:
+    boolean canThrow() -> e
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.o.n.c:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.code.MemberType type -> a
     1:1:void <clinit>():23:23 -> <clinit>
@@ -2333,9 +2402,9 @@
     51:59:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):42:50 -> a
     51:59:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
     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() -> g
-    1:1:com.android.tools.r8.ir.code.MemberType getType():33:33 -> t
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.p.n.d:
+    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.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
@@ -2345,9 +2414,9 @@
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayPut():71:71 -> a
     22:22: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):86 -> a
     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() -> g
-    1:1:com.android.tools.r8.ir.code.MemberType getType():31:31 -> t
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.p.n.e:
+    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.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
@@ -2355,9 +2424,9 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:58 -> a
     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() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> t
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.p.n.f:
+    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.ir.code.Cmp$Bias bias -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -2374,12 +2443,12 @@
     8:8:void print(com.android.tools.r8.cf.CfPrinter):79:79 -> a
     9:9:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):84:84 -> a
     10:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:91 -> a
-    1:9:int getAsmOpcode():65:73 -> t
-    10:10:int getAsmOpcode():71:71 -> t
-    11:11:int getAsmOpcode():69:69 -> t
-    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():40:40 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getType():44:44 -> v
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.p.n.g:
+    1:9:int getAsmOpcode():65:73 -> q
+    10:10:int getAsmOpcode():71:71 -> q
+    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.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
@@ -2391,9 +2460,9 @@
     26:26:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):76:76 -> a
     27:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:81 -> a
     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() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> t
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.p.n.h:
+    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.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
@@ -2403,9 +2472,9 @@
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     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() -> g
-    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> t
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.p.n.i:
+    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.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
@@ -2415,16 +2484,16 @@
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     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() -> g
-    1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> t
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.p.n.j:
+    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:
     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.p.n.k:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.o.n.k:
     com.android.tools.r8.ir.code.ValueType type -> b
     long value -> a
     boolean $assertionsDisabled -> c
@@ -2460,13 +2529,13 @@
     117:117:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveTypeLattice():127:127 -> a
     117:117:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):132 -> a
     118:118:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):132:132 -> a
-    1:2:double getDoubleValue():55:56 -> t
-    1:2:float getFloatValue():50:51 -> u
-    1:2:int getIntValue():40:41 -> v
-    1:2:long getLongValue():45:46 -> w
-    1:1:long getRawValue():36:36 -> x
-    1:1:com.android.tools.r8.ir.code.ValueType getType():32:32 -> y
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.p.n.l:
+    1:2:double getDoubleValue():55:56 -> q
+    1:2:float getFloatValue():50:51 -> r
+    1:2:int getIntValue():40:41 -> s
+    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.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
@@ -2477,10 +2546,10 @@
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):63:63 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():92:92 -> a
     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):73 -> a
-    boolean canThrow() -> g
-    boolean isConstString() -> k
-    1:1:com.android.tools.r8.graph.DexString getString():28:28 -> t
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.p.n.m:
+    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.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> b
     com.android.tools.r8.graph.DexReference item -> a
     boolean $assertionsDisabled -> c
@@ -2494,11 +2563,11 @@
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType):80:80 -> a
     9:9: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
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
-    boolean canThrow() -> g
-    boolean isDexItemBasedConstString() -> l
-    1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> t
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():37:37 -> u
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.p.n.n:
+    boolean canThrow() -> e
+    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.graph.DexField field -> b
     com.android.tools.r8.graph.DexField declaringField -> c
     boolean $assertionsDisabled -> d
@@ -2522,10 +2591,10 @@
     82:82: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):135:135 -> a
     83:83: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):133:133 -> a
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> c
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexField getField():37:37 -> t
-    1:1:int getOpcode():41:41 -> u
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.p.n.p:
+    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:
     java.util.List stack -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> a
@@ -2543,12 +2612,12 @@
     27:27:void print(com.android.tools.r8.cf.CfPrinter):281:281 -> a
     28:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):287:287 -> a
     29:29: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):301:301 -> a
-    boolean emitsIR() -> h
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():208:208 -> t
+    boolean emitsIR() -> f
+    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
-    1:1:java.util.List getStack():212:212 -> u
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.p.n.o:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.p.n.p$a:
+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:
     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
@@ -2563,7 +2632,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.p.n.q:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.o.n.q:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():79:79 -> <clinit>
@@ -2576,26 +2645,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.p.n.r:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.o.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.p.n.s:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.o.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.p.n.t:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.o.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.p.n.u:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.o.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
@@ -2603,9 +2672,9 @@
     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):59:59 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> 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):68 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():44:44 -> i
-    boolean isJump() -> n
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.p.n.v:
+    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.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -2615,15 +2684,15 @@
     3:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:92 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     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):101 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> i
-    boolean isConditionalJump() -> j
-    boolean isJump() -> n
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():40:40 -> t
-    1:15:int getOpcode():49:63 -> u
-    16:16:int getOpcode():61:61 -> u
-    17:17:int getOpcode():51:51 -> u
-    1:1:com.android.tools.r8.ir.code.ValueType getType():36:36 -> v
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.p.n.w:
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> g
+    boolean isConditionalJump() -> h
+    boolean isJump() -> l
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():40:40 -> q
+    1:15:int getOpcode():49:63 -> r
+    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.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -2643,12 +2712,12 @@
     26:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     29:29: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):102 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> i
-    boolean isConditionalJump() -> j
-    boolean isJump() -> n
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():36:36 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():40:40 -> u
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.p.n.x:
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> g
+    boolean isConditionalJump() -> h
+    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:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):24:26 -> <init>
@@ -2656,9 +2725,9 @@
     2:2:void print(com.android.tools.r8.cf.CfPrinter):36:36 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):49:50 -> a
     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 -> t
-    1:1:int getLocalIndex():40:40 -> u
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.p.n.y:
+    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.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
@@ -2667,9 +2736,9 @@
     4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:56 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):55:55 -> 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):65:65 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> t
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.p.n.z:
+    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:
     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
@@ -2680,23 +2749,20 @@
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> c
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> d
-    com.android.tools.r8.cf.code.CfLabel asLabel() -> e
-    com.android.tools.r8.cf.code.CfPosition asPosition() -> f
-    boolean canThrow() -> g
-    boolean emitsIR() -> h
-    com.android.tools.r8.cf.code.CfLabel getTarget() -> i
-    boolean isConditionalJump() -> j
-    boolean isConstString() -> k
-    boolean isDexItemBasedConstString() -> l
-    boolean isInvoke() -> m
-    boolean isJump() -> n
-    boolean isLabel() -> o
-    boolean isLoad() -> p
-    boolean isPosition() -> q
-    boolean isReturn() -> r
-    boolean isStore() -> s
+    boolean canThrow() -> e
+    boolean emitsIR() -> f
+    com.android.tools.r8.cf.code.CfLabel getTarget() -> g
+    boolean isConditionalJump() -> h
+    boolean isConstString() -> i
+    boolean isDexItemBasedConstString() -> j
+    boolean isInvoke() -> k
+    boolean isJump() -> l
+    boolean isLabel() -> m
+    boolean isLoad() -> n
+    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.p.n.A:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.o.n.A:
     int opcode -> b
     com.android.tools.r8.graph.DexMethod method -> a
     boolean itf -> c
@@ -2731,12 +2797,12 @@
     236:239:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):189:192 -> a
     240:240: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):202:202 -> a
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> d
-    boolean canThrow() -> g
-    boolean isInvoke() -> m
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():50:50 -> t
-    1:1:int getOpcode():54:54 -> u
-    1:1:boolean isInterface():58:58 -> v
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.p.n.B:
+    boolean canThrow() -> e
+    boolean isInvoke() -> k
+    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.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
@@ -2757,20 +2823,19 @@
     48:48:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105 -> a
     49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():154:154 -> a
     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() -> g
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():88:88 -> t
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.p.n.C:
+    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.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
     1:1:void print(com.android.tools.r8.cf.CfPrinter):42:42 -> a
     2:2:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:47 -> 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):66:66 -> a
-    com.android.tools.r8.cf.code.CfLabel asLabel() -> e
-    boolean emitsIR() -> h
-    boolean isLabel() -> o
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():24:27 -> t
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.p.n.D:
+    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.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):27:29 -> <init>
@@ -2783,11 +2848,11 @@
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     20:20: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):95 -> a
-    boolean emitsIR() -> h
-    boolean isLoad() -> p
-    1:1:int getLocalIndex():74:74 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> u
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.p.n.E:
+    boolean emitsIR() -> f
+    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$Opcode opcode -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -2817,16 +2882,16 @@
     44:44:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):125:125 -> a
     45:45:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):122:122 -> a
     46:46:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119:119 -> a
-    1:15:int getAsmOpcode():84:98 -> t
-    16:16:int getAsmOpcode():96:96 -> t
-    17:17:int getAsmOpcode():94:94 -> t
-    18:18:int getAsmOpcode():92:92 -> t
-    19:19:int getAsmOpcode():90:90 -> t
-    20:20:int getAsmOpcode():88:88 -> t
-    21:21:int getAsmOpcode():86:86 -> t
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():49:49 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getType():45:45 -> v
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.p.n.E$a:
+    1:15:int getAsmOpcode():84:98 -> q
+    16:16:int getAsmOpcode():96:96 -> q
+    17:17:int getAsmOpcode():94:94 -> q
+    18:18:int getAsmOpcode():92:92 -> q
+    19:19:int getAsmOpcode():90:90 -> q
+    20:20:int getAsmOpcode():88:88 -> q
+    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 Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> d
@@ -2837,7 +2902,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.p.n.F:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.o.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
@@ -2845,9 +2910,9 @@
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):50:51 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     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() -> g
-    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():30:30 -> t
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.p.n.G:
+    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.graph.DexType type -> a
     int dimensions -> b
     boolean $assertionsDisabled -> c
@@ -2863,10 +2928,10 @@
     11:11:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):182:182 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):62 -> a
     12:12: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):72:72 -> a
-    boolean canThrow() -> g
-    1:1:int getDimensions():35:35 -> t
-    1:1:com.android.tools.r8.graph.DexType getType():31:31 -> u
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.p.n.H:
+    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.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
@@ -2874,9 +2939,9 @@
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     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 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getType():31:31 -> u
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.p.n.I:
+    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.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
@@ -2884,9 +2949,9 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):44:44 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:54 -> a
     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() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> t
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.p.n.J:
+    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.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -2902,16 +2967,16 @@
     29:30:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):83:84 -> a
     31:33:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):95:97 -> a
     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() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():33:33 -> t
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.p.n.K:
+    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:
     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() -> h
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.p.n.L:
+    boolean emitsIR() -> f
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.o.n.L:
     com.android.tools.r8.ir.code.NumericType to -> b
     com.android.tools.r8.ir.code.NumericType from -> a
     boolean $assertionsDisabled -> c
@@ -2938,13 +3003,13 @@
     19:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:151 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     21:21: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):160 -> a
-    1:53:int getAsmOpcode():55:107 -> t
-    54:101:int getAsmOpcode():57:104 -> t
-    102:110:int getAsmOpcode():85:93 -> t
-    111:119:int getAsmOpcode():74:82 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getFromType():37:37 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getToType():41:41 -> v
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.p.n.M:
+    1:53:int getAsmOpcode():55:107 -> q
+    54:101:int getAsmOpcode():57:104 -> q
+    102:110:int getAsmOpcode():85:93 -> q
+    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.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>
@@ -2952,12 +3017,10 @@
     2:2:void print(com.android.tools.r8.cf.CfPrinter):36:36 -> a
     3:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):64:66 -> a
     6:6: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):75:75 -> a
-    com.android.tools.r8.cf.code.CfPosition asPosition() -> f
-    boolean emitsIR() -> h
-    boolean isPosition() -> q
-    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():44:44 -> t
-    1:1:com.android.tools.r8.ir.code.Position getPosition():40:40 -> u
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.p.n.N:
+    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.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
@@ -2967,19 +3030,19 @@
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:74 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     18:18: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):83 -> a
-    boolean isJump() -> n
-    boolean isReturn() -> r
-    1:1:com.android.tools.r8.ir.code.ValueType getType():31:31 -> t
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.p.n.O:
+    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:
     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
     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):43:43 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> 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):52 -> a
-    boolean isJump() -> n
-    boolean isReturn() -> r
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.p.n.P:
+    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$Opcode opcode -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -3105,9 +3168,9 @@
     17:17: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):277 -> b
     18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
     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() -> h
-    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():89:89 -> t
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.p.n.P$a:
+    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 Swap -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> k
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> i
@@ -3123,7 +3186,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.p.n.Q:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.o.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>
@@ -3136,11 +3199,11 @@
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19: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):94 -> a
-    boolean emitsIR() -> h
-    boolean isStore() -> s
-    1:1:int getLocalIndex():74:74 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> u
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.p.n.S:
+    boolean emitsIR() -> f
+    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.CfLabel defaultTarget -> b
     int[] keys -> c
     java.util.List targets -> d
@@ -3154,29 +3217,29 @@
     15:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:102 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     21:21: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):111 -> a
-    boolean isJump() -> n
-    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():46:46 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50:50 -> u
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50 -> u
-    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():42:42 -> v
-    1:1:java.util.List getSwitchTargets():54:54 -> w
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.p.n.S$a:
+    boolean isJump() -> l
+    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():46:46 -> q
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50:50 -> r
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> r
+    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[] $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.p.n.T:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.o.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
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):44:45 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     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() -> g
-    boolean isJump() -> n
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.p.n.U:
+    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.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -3813,18 +3876,18 @@
     3:4:void com.android.tools.r8.code.Format51l.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):34 -> a
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     5:5:long decodedValue():43:43 -> a
-    6:10:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):44:48 -> a
-    11:12:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    13:13:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
-    14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
+    6:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
+    8:8:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object) -> equals
-    int com.android.tools.r8.code.Format51l.hashCode() -> hashCode
+    1:5:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):44:48 -> equals
+    1:5:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):0 -> equals
+    1:1:int com.android.tools.r8.code.Format51l.hashCode():39:39 -> hashCode
+    1:1:int com.android.tools.r8.code.Format51l.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
-    1:1:int com.android.tools.r8.code.Format51l.hashCode():39:39 -> z
 com.android.tools.r8.code.ConstWide16 -> com.android.tools.r8.code.c0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -4454,19 +4517,19 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     1:1:void com.android.tools.r8.code.Format10t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):30:30 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
-    2:5:boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object):40:43 -> a
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    7:7:java.lang.String com.android.tools.r8.code.Format10t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
-    7:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
+    2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
+    3:3:java.lang.String com.android.tools.r8.code.Format10t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
+    3:3:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format10t.toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object) -> equals
-    int com.android.tools.r8.code.Format10t.hashCode() -> hashCode
+    1:4:boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object):40:43 -> equals
+    1:4:boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object):0 -> equals
+    1:1:int com.android.tools.r8.code.Format10t.hashCode():35:35 -> hashCode
+    1:1:int com.android.tools.r8.code.Format10t.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
     1:1:int[] getTargets():39:39 -> o
-    1:1:int com.android.tools.r8.code.Format10t.hashCode():35:35 -> z
 com.android.tools.r8.code.Goto16 -> com.android.tools.r8.code.W0:
     short com.android.tools.r8.code.Format20t.AAAA -> f
     boolean com.android.tools.r8.code.Format20t.$assertionsDisabled -> g
@@ -4481,19 +4544,19 @@
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
     3:3:void com.android.tools.r8.code.Format20t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):30 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
-    4:7:boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object):40:43 -> a
-    8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    9:9:java.lang.String com.android.tools.r8.code.Format20t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
-    9:9:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
+    4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
+    5:5:java.lang.String com.android.tools.r8.code.Format20t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
+    5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format20t.toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object) -> equals
-    int com.android.tools.r8.code.Format20t.hashCode() -> hashCode
+    1:4:boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object):40:43 -> equals
+    1:4:boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object):0 -> equals
+    1:1:int com.android.tools.r8.code.Format20t.hashCode():35:35 -> hashCode
+    1:1:int com.android.tools.r8.code.Format20t.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
     1:1:int[] getTargets():39:39 -> o
-    1:1:int com.android.tools.r8.code.Format20t.hashCode():35:35 -> z
 com.android.tools.r8.code.Goto32 -> com.android.tools.r8.code.X0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -5599,7 +5662,6 @@
     2:12:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):23 -> <init>
     13:27:void com.android.tools.r8.code.Format45cc.<init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int,int,int,int):43:57 -> <init>
     13:27:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int,int,int,int):28 -> <init>
-    1:9:int com.android.tools.r8.code.Format45cc.hashCode():62:70 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0:0 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34 -> a
@@ -5608,26 +5670,27 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34:34 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
-    6:17:boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object):75:86 -> a
-    18:19:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92:93 -> a
-    18:19:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    20:22:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):98:100 -> a
-    20:22:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
-    23:23:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
-    23:23:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):100 -> a
-    23:23:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
-    24:24:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):101:101 -> a
-    24:24:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
-    25:32:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):106:113 -> a
-    25:32:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    33:35:java.lang.String com.android.tools.r8.code.Format45cc.itemToString(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.naming.ClassNameMapper):130:132 -> a
-    36:44:void com.android.tools.r8.code.Format45cc.appendRegisterArguments(java.lang.StringBuilder,java.lang.String):138:146 -> a
+    6:7:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92:93 -> a
+    6:7:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    8:10:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):98:100 -> a
+    8:10:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
+    11:11:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
+    11:11:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):100 -> a
+    11:11:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
+    12:12:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):101:101 -> a
+    12:12:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
+    13:20:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):106:113 -> a
+    13:20:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    21:23:java.lang.String com.android.tools.r8.code.Format45cc.itemToString(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.naming.ClassNameMapper):130:132 -> a
+    24:32:void com.android.tools.r8.code.Format45cc.appendRegisterArguments(java.lang.StringBuilder,java.lang.String):138:146 -> a
     1:7:java.lang.String com.android.tools.r8.code.Format45cc.toString(com.android.tools.r8.naming.ClassNameMapper):118:124 -> b
     1:7:java.lang.String com.android.tools.r8.code.Format45cc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
-    boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object) -> equals
+    1:12:boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object):75:86 -> equals
+    1:12:boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object):0 -> equals
     boolean canThrow() -> f
     com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod() -> h
-    int com.android.tools.r8.code.Format45cc.hashCode() -> hashCode
+    1:9:int com.android.tools.r8.code.Format45cc.hashCode():62:70 -> hashCode
+    1:9:int com.android.tools.r8.code.Format45cc.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -5661,22 +5724,22 @@
     10:10:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():0 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56:56 -> a
-    12:16:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):58:62 -> a
-    17:24:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):85:92 -> a
-    17:24:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    25:26:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:99 -> a
-    25:26:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    27:33:void com.android.tools.r8.code.Format4rcc.appendRegisterRange(java.lang.StringBuilder):115:121 -> a
+    12:19:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):85:92 -> a
+    12:19:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    20:21:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:99 -> a
+    20:21:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    22:28:void com.android.tools.r8.code.Format4rcc.appendRegisterRange(java.lang.StringBuilder):115:121 -> a
     1:14:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):67:80 -> b
     1:14:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
-    boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object) -> equals
+    1:5:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):58:62 -> equals
+    1:5:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):0 -> equals
     boolean canThrow() -> f
     1:1:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> h
-    int com.android.tools.r8.code.Format4rcc.hashCode() -> hashCode
+    1:2:int com.android.tools.r8.code.Format4rcc.hashCode():52:53 -> hashCode
+    1:2:int com.android.tools.r8.code.Format4rcc.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
-    1:2:int com.android.tools.r8.code.Format4rcc.hashCode():52:53 -> z
 com.android.tools.r8.code.InvokeStatic -> com.android.tools.r8.code.J1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
@@ -7155,12 +7218,12 @@
     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.q.a.a.a.a:
+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 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.q.a.a.a.b:
+com.android.tools.r8.com.google.common.base.Ascii -> com.android.tools.r8.p.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
@@ -7168,7 +7231,7 @@
     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.q.a.a.a.o:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.p.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>
@@ -7194,7 +7257,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.q.a.a.a.c:
+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 INSTANCE -> b
     1:1:void <clinit>():1119:1119 -> <clinit>
     1:1:void <init>():1122:1122 -> <init>
@@ -7204,27 +7267,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.q.a.a.a.d:
+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 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.q.a.a.a.e:
+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 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.q.a.a.a.f:
+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 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.q.a.a.a.g:
+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 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.q.a.a.a.h:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.p.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>
@@ -7239,7 +7302,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.q.a.a.a.i:
+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 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
@@ -7250,9 +7313,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.q.a.a.a.j:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.p.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.q.a.a.a.k:
+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 INSTANCE -> b
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -7262,7 +7325,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.q.a.a.a.l:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.p.a.a.a.l:
     char[] rangeStarts -> b
     char[] rangeEnds -> c
     java.lang.String description -> a
@@ -7274,24 +7337,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.q.a.a.a.m:
+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 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.q.a.a.a.n:
+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 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.q.a.a.a.p:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.p.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.q.a.a.a.q:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.p.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.q.a.a.a.v:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.p.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
@@ -7302,14 +7365,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.q.a.a.a.r:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.q.a.a.a.s:
+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$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.q.a.a.a.t:
+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 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>
@@ -7319,12 +7382,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.q.a.a.a.u:
+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 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.q.a.a.a.v$a:
+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 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>
@@ -7333,8 +7396,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.q.a.a.a.w:
-com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.q.a.a.a.x:
+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 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>
@@ -7345,19 +7408,19 @@
     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.q.a.a.a.z:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.p.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.q.a.a.a.y:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.p.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.q.a.a.a.D:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.p.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
@@ -7420,8 +7483,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.q.a.a.a.A:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.q.a.a.a.C:
+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$ToStringHelper$ValueHolder holderTail -> c
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderHead -> b
     java.lang.String className -> a
@@ -7438,18 +7501,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.q.a.a.a.B:
+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 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.q.a.a.a.E:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.p.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.q.a.a.a.F:
+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.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
@@ -7461,7 +7524,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.q.a.a.a.I:
+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.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -7481,21 +7544,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.q.a.a.a.G:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.q.a.a.a.H:
+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:
     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.q.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.p.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.q.a.a.a.K:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.q.a.a.a.L:
+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.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.q.a.a.a.Q:
+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 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
@@ -7503,15 +7566,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.q.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.p.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.q.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.p.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.q.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.p.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.q.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.p.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.q.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.p.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>
@@ -7522,7 +7585,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.q.a.a.a.U:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.p.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
@@ -7535,24 +7598,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.q.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.p.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.q.a.a.a.V:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.q.a.a.a.W:
+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 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.q.a.a.a.X:
+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.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.q.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.p.a.a.a.Y:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -7582,7 +7645,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.q.a.a.b.a:
+com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.p.a.a.b.a:
     int position -> b
     int size -> a
     1:1:void <init>(int):52:52 -> <init>
@@ -7596,7 +7659,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.q.a.a.b.c:
+com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.p.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>
@@ -7608,7 +7671,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.q.a.a.b.b:
+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[] $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
@@ -7617,14 +7680,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.q.a.a.b.d:
+com.android.tools.r8.com.google.common.collect.AbstractListMultimap -> com.android.tools.r8.p.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.q.a.a.b.f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap -> com.android.tools.r8.p.a.a.b.f:
     int totalSize -> f
     java.util.Map map -> e
     1:3:void <init>(java.util.Map):122:124 -> <init>
@@ -7672,9 +7735,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.q.a.a.b.e:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2 -> com.android.tools.r8.p.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.q.a.a.b.f$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> com.android.tools.r8.p.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>
@@ -7702,7 +7765,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.q.a.a.b.f$a$a:
+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 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
@@ -7715,7 +7778,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.q.a.a.b.f$a$b:
+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 this$1 -> c
     java.util.Collection collection -> b
     java.util.Iterator delegateIterator -> a
@@ -7724,7 +7787,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.q.a.a.b.f$b:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr -> com.android.tools.r8.p.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
@@ -7738,7 +7801,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.q.a.a.b.f$c:
+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 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
@@ -7767,7 +7830,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.q.a.a.b.g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet$1 -> com.android.tools.r8.p.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
@@ -7775,7 +7838,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.q.a.a.b.f$d:
+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 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
@@ -7821,7 +7884,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.q.a.a.b.f$e:
+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 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
@@ -7853,9 +7916,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.q.a.a.b.f$f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> com.android.tools.r8.p.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.q.a.a.b.f$g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> com.android.tools.r8.p.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>
@@ -7869,7 +7932,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.q.a.a.b.f$h:
+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 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
@@ -7881,7 +7944,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.q.a.a.b.f$i:
+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 ancestor -> c
     java.util.Collection ancestorDelegate -> d
     java.util.Collection delegate -> b
@@ -7911,7 +7974,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.q.a.a.b.f$i$a:
+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 this$1 -> c
     java.util.Collection originalDelegate -> b
     java.util.Iterator delegateIterator -> a
@@ -7923,7 +7986,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.q.a.a.b.f$j:
+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 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
@@ -8000,7 +8063,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.q.a.a.b.f$j$a:
+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 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>
@@ -8013,7 +8076,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.q.a.a.b.f$k:
+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 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
@@ -8043,11 +8106,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.q.a.a.b.f$l:
+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 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.q.a.a.b.f$m:
+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 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
@@ -8077,7 +8140,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.q.a.a.b.j:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset -> com.android.tools.r8.p.a.a.b.j:
     java.util.Map backingMap -> c
     long size -> d
     1:3:void <init>(java.util.Map):60:62 -> <init>
@@ -8100,7 +8163,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.q.a.a.b.i:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 -> com.android.tools.r8.p.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
@@ -8109,7 +8172,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.q.a.a.b.h:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1$1 -> com.android.tools.r8.p.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>
@@ -8118,7 +8181,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.q.a.a.b.j$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> com.android.tools.r8.p.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
@@ -8129,13 +8192,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.q.a.a.b.k:
+com.android.tools.r8.com.google.common.collect.AbstractMapEntry -> com.android.tools.r8.p.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.q.a.a.b.m:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap -> com.android.tools.r8.p.a.a.b.m:
     java.util.Map asMap -> d
     java.util.Collection entries -> a
     java.util.Set keySet -> b
@@ -8158,14 +8221,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.q.a.a.b.l:
-com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries -> com.android.tools.r8.q.a.a.b.m$a:
+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 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.q.a.a.b.n:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset -> com.android.tools.r8.p.a.a.b.n:
     java.util.Set elementSet -> a
     java.util.Set entrySet -> b
     1:1:void <init>():47:47 -> <init>
@@ -8206,16 +8269,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.q.a.a.b.n$a:
+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 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.q.a.a.b.n$b:
+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 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.q.a.a.b.o:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.p.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>
@@ -8242,10 +8305,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.q.a.a.b.p:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.p.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.q.a.a.b.q:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.p.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
@@ -8255,7 +8318,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.q.a.a.b.r:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.p.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>
@@ -8266,7 +8329,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.q.a.a.b.s:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.p.a.a.b.s:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -8280,7 +8343,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.q.a.a.b.t:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.p.a.a.b.t:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -8296,7 +8359,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.q.a.a.b.u:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.p.a.a.b.u:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -8307,7 +8370,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.q.a.a.b.v:
+com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.p.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
@@ -8410,84 +8473,23 @@
     334:334:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> a
     335:335:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
     336:338:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
-    339:339:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590:1590 -> a
-    340:340:void com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.<init>():156:156 -> a
-    340:340:void com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.<init>():237 -> a
-    340:340:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.builder():211 -> a
-    340:340:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1633 -> a
-    340:340:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    341:344:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1634:1637 -> a
-    341:344:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    345:346: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
-    345:346:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.put(java.lang.Object,java.lang.Object):242 -> a
-    345:346:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1637 -> a
-    345:346:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):313:315 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    350:350:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.isPartialView():476:476 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):316 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):346:346 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.of():144:144 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):347 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):351:353 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    356:356:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.isPartialView():476:476 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):354 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):359:372 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    371:371:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328:328 -> a
-    371:371:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    371:371:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    372:372:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    372:372:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1632 -> a
-    372:372:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    373:374:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
-    375:379:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
-    380:383:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
-    384:385:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
-    386:399:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:2001 -> a
-    400:400:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    400:400:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
-    401:401:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> a
-    402:402:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    402:402:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> a
-    403:403:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.keyOrNull(java.util.Map$Entry):3891:3891 -> a
-    404:409:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
-    404:409:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
-    410:413:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1672 -> a
-    414:414:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
-    414:414:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1672 -> a
-    415:418:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1673:1676 -> a
+    339:340:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
+    341:345:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
+    346:349:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
+    350:351:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
+    352:365:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:2001 -> a
+    366:366:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    366:366:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
+    367:367:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> a
+    368:368:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    368:368:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> a
+    369:369:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.keyOrNull(java.util.Map$Entry):3891:3891 -> a
+    370:375:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
+    370:375:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
+    376:379:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1672 -> a
+    380:380:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
+    380:380:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1672 -> a
+    381:384:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1673:1676 -> a
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smearedHash(java.lang.Object):54:54 -> b
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> b
     3:17:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> b
@@ -8546,14 +8548,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.q.a.a.b.w:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.p.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.q.a.a.b.x:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.p.a.a.b.x:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -8564,11 +8566,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.q.a.a.b.y:
+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 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.q.a.a.b.B:
+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.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
@@ -8583,18 +8585,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.q.a.a.b.A:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.p.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.q.a.a.b.z:
+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 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.q.a.a.b.C:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.p.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
@@ -8614,7 +8616,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.q.a.a.b.D:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.p.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
@@ -8629,7 +8631,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.q.a.a.b.I:
+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$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
@@ -8708,19 +8710,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.q.a.a.b.E:
+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 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.q.a.a.b.E$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 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.q.a.a.b.F:
+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 nextInKToVBucket -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInVToKBucket -> f
     int valueHash -> d
@@ -8728,7 +8730,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.q.a.a.b.I$a:
+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 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>
@@ -8769,27 +8771,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.q.a.a.b.G:
+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 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.q.a.a.b.G$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$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.q.a.a.b.I$a$a:
+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 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.q.a.a.b.H:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.p.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.q.a.a.b.I$b:
+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$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
@@ -8802,15 +8804,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.q.a.a.b.I$c:
+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 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.q.a.a.b.J:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.p.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.q.a.a.b.K:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.p.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
@@ -8841,14 +8843,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.q.a.a.b.L:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.p.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.q.a.a.b.M:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.p.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
@@ -8861,7 +8863,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.q.a.a.b.M$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.p.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
@@ -8875,9 +8877,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.q.a.a.b.N:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.p.a.a.b.N:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.q.a.a.b.Q:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.p.a.a.b.Q:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -8904,7 +8906,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.q.a.a.b.O:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.p.a.a.b.O:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -8920,19 +8922,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.q.a.a.b.P:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.p.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.q.a.a.b.S:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.p.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.q.a.a.b.T:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.p.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>
@@ -8967,7 +8969,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.q.a.a.b.U:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.p.a.a.b.U:
     java.util.EnumSet delegate -> c
     int hashCode -> d
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -8990,7 +8992,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.q.a.a.b.W:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.p.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
@@ -9062,11 +9064,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.q.a.a.b.V:
+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 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.q.a.a.b.W$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.p.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
@@ -9076,7 +9078,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.q.a.a.b.X:
+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 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
@@ -9109,7 +9111,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.q.a.a.b.W$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.p.a.a.b.W$b:
     int offset -> b
     int length -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
@@ -9126,12 +9128,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.q.a.a.b.Z:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.p.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
-    3:4:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):405:406 -> get
-    3:4:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.q.a.a.b.Y:
+    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:
     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
@@ -9167,7 +9168,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.q.a.a.b.b0:
+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.ImmutableCollection values -> c
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet keySet -> b
@@ -9248,12 +9249,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.q.a.a.b.a0:
+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.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.q.a.a.b.b0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.p.a.a.b.b0$a:
     java.util.Map$Entry[] entries -> a
     int size -> b
     boolean entriesUsed -> c
@@ -9272,28 +9273,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.q.a.a.b.c0:
+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 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.q.a.a.b.f0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.p.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.q.a.a.b.d0:
+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 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.q.a.a.b.e0:
+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 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.q.a.a.b.h0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.p.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
@@ -9301,7 +9302,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.q.a.a.b.g0:
+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.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>
@@ -9316,7 +9317,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.q.a.a.b.i0:
+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.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
@@ -9331,7 +9332,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.q.a.a.b.l0:
+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.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
@@ -9357,19 +9358,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.q.a.a.b.j0:
+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.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.q.a.a.b.k0:
+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 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.q.a.a.b.p0:
+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.ImmutableMap map -> e
     int size -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
@@ -9411,13 +9412,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.q.a.a.b.m0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.p.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.q.a.a.b.n0:
+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.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.q.a.a.b.o0:
+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 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
@@ -9431,7 +9432,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.q.a.a.b.p0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.p.a.a.b.p0$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -9444,7 +9445,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.q.a.a.b.p0$b:
+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 this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     boolean isPartialView() -> b
@@ -9466,7 +9467,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.q.a.a.b.r0:
+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.ImmutableList asList -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> c
     1:1:void <init>():235:235 -> <init>
@@ -9493,14 +9494,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.q.a.a.b.q0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.p.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.q.a.a.b.r0$a:
+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 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>
@@ -9510,9 +9511,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.q.a.a.b.s0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.p.a.a.b.s0:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.q.a.a.b.t0:
+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.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
@@ -9545,7 +9546,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.q.a.a.b.t0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.p.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
@@ -9554,7 +9555,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.q.a.a.b.v0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.p.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
@@ -9565,13 +9566,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.q.a.a.b.u0:
+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 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.q.a.a.b.w0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.p.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
@@ -9591,7 +9592,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.q.a.a.b.A0:
+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.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
@@ -9779,13 +9780,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.q.a.a.b.x0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1 -> com.android.tools.r8.p.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.q.a.a.b.z0:
+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 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
@@ -9795,7 +9796,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.q.a.a.b.y0:
+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 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
@@ -9807,7 +9808,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.q.a.a.b.A0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$Builder -> com.android.tools.r8.p.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
@@ -9819,9 +9820,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.q.a.a.b.B0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.p.a.a.b.B0:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.q.a.a.b.C0:
+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 descendingSet -> d
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
@@ -9900,7 +9901,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.q.a.a.b.C0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.p.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
@@ -9917,9 +9918,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.q.a.a.b.D0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.p.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.q.a.a.b.E0:
+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.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>
@@ -9945,35 +9946,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.q.a.a.b.F0:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.p.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.q.a.a.b.G0:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.p.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.q.a.a.b.H0:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.p.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.q.a.a.b.I0:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.p.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.q.a.a.b.J0:
+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.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.q.a.a.b.K0:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.p.a.a.b.K0:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -9982,21 +9983,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.q.a.a.b.L0:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.p.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.q.a.a.b.M0:
+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.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.q.a.a.b.N0:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.p.a.a.b.N0:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -10010,16 +10011,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.q.a.a.b.O0:
+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 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.q.a.a.b.P0:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.q.a.a.b.Q0:
+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:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.q.a.a.b.S0:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.p.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
@@ -10080,7 +10081,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.q.a.a.b.R0:
+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 this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -10100,7 +10101,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.q.a.a.b.T0:
+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.MapMakerInternalMap$Strength valueStrength -> d
     boolean useCustomMap -> a
     int initialCapacity -> b
@@ -10122,7 +10123,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.q.a.a.b.Y0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.p.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
@@ -10244,11 +10245,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.q.a.a.b.U0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.p.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.q.a.a.b.V0:
+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$InternalEntry next -> c
     java.lang.Object key -> a
     int hash -> b
@@ -10256,19 +10257,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.q.a.a.b.W0:
+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$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.q.a.a.b.X0:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.q.a.a.b.Y0$a:
+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:
     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.q.a.a.b.Y0$b:
+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 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
@@ -10277,7 +10278,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.q.a.a.b.Y0$c:
+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$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
@@ -10305,21 +10306,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.q.a.a.b.Z0:
+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 getNext() -> b
     int getHash() -> c
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.q.a.a.b.a1:
+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$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.q.a.a.b.Y0$d:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.p.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.q.a.a.b.Y0$e:
+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 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
@@ -10328,12 +10329,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.q.a.a.b.b1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.p.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.q.a.a.b.c1:
+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 map -> a
     java.util.concurrent.atomic.AtomicInteger readCount -> g
     int maxSegmentSize -> f
@@ -10420,27 +10421,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.q.a.a.b.f1:
+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 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.q.a.a.b.d1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.p.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.q.a.a.b.e1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.p.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.q.a.a.b.h1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.p.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.q.a.a.b.g1:
+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 INSTANCE -> a
     1:1:void <clinit>():435:435 -> <clinit>
     1:1:void <init>():432:432 -> <init>
@@ -10457,10 +10458,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.q.a.a.b.i1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.p.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.q.a.a.b.k1:
+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$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>
@@ -10468,7 +10469,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.q.a.a.b.j1:
+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 INSTANCE -> a
     1:1:void <clinit>():535:535 -> <clinit>
     1:1:void <init>():532:532 -> <init>
@@ -10485,7 +10486,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.q.a.a.b.l1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.p.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>
@@ -10493,12 +10494,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.q.a.a.b.Y0$f:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.p.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.q.a.a.b.Y0$g:
+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 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
@@ -10508,7 +10509,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.q.a.a.b.n1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.p.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>
@@ -10520,7 +10521,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.q.a.a.b.m1:
+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 INSTANCE -> a
     1:1:void <clinit>():805:805 -> <clinit>
     1:1:void <init>():802:802 -> <init>
@@ -10540,7 +10541,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.q.a.a.b.o1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.p.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>
@@ -10548,7 +10549,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.q.a.a.b.q1:
+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$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>
@@ -10559,7 +10560,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.q.a.a.b.p1:
+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 INSTANCE -> a
     1:1:void <clinit>():909:909 -> <clinit>
     1:1:void <init>():906:906 -> <init>
@@ -10579,7 +10580,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.q.a.a.b.r1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.p.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>
@@ -10589,17 +10590,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.q.a.a.b.s1:
+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$WeakValueReference getValueReference() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.q.a.a.b.t1:
+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 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.q.a.a.b.u1:
+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$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.q.a.a.b.Y0$h:
+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 this$0 -> c
     java.lang.Object value -> b
     java.lang.Object key -> a
@@ -10609,13 +10610,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.q.a.a.b.v1:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.q.a.a.b.w1:
+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:
     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.q.a.a.b.x1:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.p.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
@@ -10628,23 +10629,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.q.a.a.b.A1:
+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 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.q.a.a.b.y1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.p.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.q.a.a.b.z1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.p.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.q.a.a.b.B1:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.p.a.a.b.B1:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -10664,11 +10665,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.q.a.a.b.D1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.p.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.q.a.a.b.C1:
+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 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
@@ -10681,7 +10682,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.q.a.a.b.E1:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.p.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
@@ -10717,7 +10718,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.q.a.a.b.F1:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.p.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
@@ -10774,7 +10775,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.q.a.a.b.G1:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.p.a.a.b.G1:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -10786,31 +10787,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.q.a.a.b.H1:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.p.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.q.a.a.b.I1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.p.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.q.a.a.b.J1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.p.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.q.a.a.b.K1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.p.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.q.a.a.b.M1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.p.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.q.a.a.b.L1:
+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 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>
@@ -10823,12 +10824,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.q.a.a.b.N1:
+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.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.q.a.a.b.O1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.p.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
@@ -10846,7 +10847,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.q.a.a.b.R1:
+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.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
@@ -10869,17 +10870,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.q.a.a.b.Q1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.p.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.q.a.a.b.P1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.p.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.q.a.a.b.R1$a:
+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 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
@@ -10892,7 +10893,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.q.a.a.b.S1:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.p.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
@@ -10904,22 +10905,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.q.a.a.b.S1$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.p.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.q.a.a.b.T1:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.p.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.q.a.a.b.U1:
+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 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.q.a.a.b.W1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.p.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
@@ -10949,25 +10950,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.q.a.a.b.V1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.p.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.q.a.a.b.X1:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.p.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.q.a.a.b.Y1:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.p.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.q.a.a.b.Z1:
+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 INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -10981,11 +10982,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.q.a.a.b.a2:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.p.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.q.a.a.b.b2:
+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.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>
@@ -10997,7 +10998,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.q.a.a.b.e2:
+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.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
@@ -11043,8 +11044,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.q.a.a.b.c2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.q.a.a.b.e2$a:
+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 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>
@@ -11068,7 +11069,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.q.a.a.b.e2$a$a:
+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 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
@@ -11079,7 +11080,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.q.a.a.b.d2:
+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 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
@@ -11088,7 +11089,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.q.a.a.b.f2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.p.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>
@@ -11101,7 +11102,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.q.a.a.b.i2:
+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.ImmutableMap EMPTY -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> f
     java.util.Map$Entry[] entries -> e
@@ -11145,7 +11146,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.q.a.a.b.g2:
+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 map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11154,13 +11155,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.q.a.a.b.h2:
+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 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.q.a.a.b.k2:
+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 EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -11179,8 +11180,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.q.a.a.b.j2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.q.a.a.b.k2$a:
+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 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>
@@ -11190,11 +11191,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.q.a.a.b.l2:
+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.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.q.a.a.b.m2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.p.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
@@ -11215,7 +11216,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.q.a.a.b.n2:
+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 NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -11320,7 +11321,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.q.a.a.b.o2:
+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 INSTANCE -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():98:98 -> <init>
@@ -11332,7 +11333,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.q.a.a.b.p2:
+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.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
@@ -11340,7 +11341,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.q.a.a.b.r2:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.p.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>
@@ -11352,13 +11353,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.q.a.a.b.q2:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.p.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.q.a.a.b.t2:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.p.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>
@@ -11370,12 +11371,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.q.a.a.b.s2:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.p.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.q.a.a.b.v2:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.p.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>
@@ -11388,12 +11389,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.q.a.a.b.u2:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.p.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.q.a.a.b.z2:
+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.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>
@@ -11401,31 +11402,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.q.a.a.b.y2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.p.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.q.a.a.b.x2:
+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 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.q.a.a.b.w2:
+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 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.q.a.a.b.A2:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.p.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.q.a.a.b.B2:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.p.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
@@ -11435,7 +11436,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.q.a.a.b.C2:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.p.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
@@ -11463,7 +11464,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.q.a.a.b.D2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.p.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
@@ -11484,7 +11485,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.q.a.a.b.E2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.p.a.a.b.E2:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11499,7 +11500,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.q.a.a.b.F2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.p.a.a.b.F2:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11515,22 +11516,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.q.a.a.b.G2:
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.q.a.a.b.H2:
+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.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.q.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.p.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.q.a.a.b.J2:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.p.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.q.a.a.b.K2:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.p.a.a.b.K2:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11544,33 +11545,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.q.a.a.b.L2:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.p.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.q.a.a.b.M2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.p.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.q.a.a.b.N2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.p.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.q.a.a.c.a:
+com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.p.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.q.a.a.c.b:
+com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.p.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.q.a.a.c.e:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.p.a.a.c.e:
     char[] hexDigits -> a
     1:1:void <clinit>():429:429 -> <clinit>
     1:1:void <init>():38:38 -> <init>
@@ -11584,7 +11585,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.q.a.a.c.c:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.p.a.a.c.c:
     byte[] bytes -> b
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -11592,30 +11593,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.q.a.a.c.d:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.p.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.q.a.a.c.f:
+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.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.q.a.a.c.g:
+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.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.q.a.a.c.i:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.p.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.q.a.a.c.h:
+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.HashFunction SHA_256 -> a
     1:1:void <clinit>():204:204 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.q.a.a.c.l:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.p.a.a.c.l:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -11630,8 +11631,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.q.a.a.c.j:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.q.a.a.c.k:
+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:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -11664,7 +11665,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.q.a.a.c.n:
+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.HashFunction MURMUR3_32 -> b
     int seed -> a
     1:3:void <clinit>():53:55 -> <clinit>
@@ -11695,7 +11696,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.q.a.a.c.m:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.p.a.a.c.m:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -11715,7 +11716,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.q.a.a.d.e:
+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 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>
@@ -11738,7 +11739,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.q.a.a.d.a:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.p.a.a.d.a:
     char[] chars -> b
     int bytesPerChunk -> f
     byte[] decodabet -> g
@@ -11755,19 +11756,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.q.a.a.d.b:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.p.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.q.a.a.d.c:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.p.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.q.a.a.d.d:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.p.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>
@@ -11782,7 +11783,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.q.a.a.d.g:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.p.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
@@ -11792,13 +11793,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.q.a.a.d.f:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.p.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.q.a.a.d.h:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.p.a.a.d.h:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -11816,11 +11817,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.q.a.a.d.k:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.p.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.q.a.a.d.i:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.p.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>
@@ -11832,13 +11833,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.q.a.a.d.j:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.p.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.q.a.a.d.l:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.p.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.q.a.a.d.p:
+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$Suppressor suppressor -> a
     java.util.Deque stack -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> c
@@ -11850,12 +11851,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.q.a.a.d.m:
+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 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.q.a.a.d.n:
+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 INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -11866,9 +11867,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.q.a.a.d.o:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.p.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.q.a.a.e.b:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.p.a.a.e.b:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -11888,12 +11889,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.q.a.a.e.a:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.p.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.q.a.a.e.c:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.p.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.q.a.b.a:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.p.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
@@ -11905,7 +11906,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.q.a.b.b:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.p.a.b.b:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -11921,15 +11922,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.q.a.b.c:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.p.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.q.a.b.d:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.p.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.q.a.b.e:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.p.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
@@ -11949,11 +11950,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.q.a.b.f:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.p.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.q.a.b.g:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.p.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
@@ -11975,7 +11976,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.q.a.b.h:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.p.a.b.h:
     java.lang.Class[] PRIMITIVE_TYPES -> b
     java.lang.Object value -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12014,20 +12015,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.q.a.b.i:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.p.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.q.a.b.k:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.p.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.q.a.b.j:
+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 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.q.a.b.l.a:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.p.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
@@ -12037,7 +12038,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.q.a.b.l.d:
+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$Node header -> e
     java.util.Comparator NATURAL_ORDER -> h
     boolean $assertionsDisabled -> i
@@ -12080,12 +12081,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.q.a.b.l.b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.p.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.q.a.b.l.d$a:
+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 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
@@ -12093,11 +12094,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.q.a.b.l.c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.p.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.q.a.b.l.d$b:
+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 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
@@ -12109,10 +12110,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.q.a.b.l.e:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.p.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.q.a.b.l.d$c:
+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 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
@@ -12125,7 +12126,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.q.a.b.l.f:
+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 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
@@ -12142,7 +12143,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.q.a.b.l.g.w:
+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.TypeAdapter STRING -> l
     com.android.tools.r8.com.google.gson.TypeAdapter STRING_BUILDER -> m
     com.android.tools.r8.com.google.gson.TypeAdapter NUMBER -> j
@@ -12166,21 +12167,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.q.a.b.l.g.f:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.p.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.q.a.b.l.g.a:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.p.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.q.a.b.l.g.b:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.p.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
@@ -12189,7 +12190,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.q.a.b.l.g.c:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.p.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
@@ -12198,21 +12199,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.q.a.b.l.g.d:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.p.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.q.a.b.l.g.e:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.p.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.q.a.b.l.g.p:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.p.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
@@ -12225,63 +12226,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.q.a.b.l.g.g:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.p.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.q.a.b.l.g.h:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.p.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.q.a.b.l.g.i:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.p.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.q.a.b.l.g.j:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.p.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.q.a.b.l.g.k:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.p.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.q.a.b.l.g.l:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.p.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.q.a.b.l.g.m:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.p.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.q.a.b.l.g.n:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.p.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.q.a.b.l.g.o:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.p.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
@@ -12307,49 +12308,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.q.a.b.l.g.q:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.p.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.q.a.b.l.g.r:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.p.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.q.a.b.l.g.s:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.p.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.q.a.b.l.g.t:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.p.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.q.a.b.l.g.u:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.p.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.q.a.b.l.g.v:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.p.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.q.a.b.m.a:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.p.a.b.m.a:
     long peekedLong -> i
     char[] buffer -> c
     int stackSize -> m
@@ -12451,7 +12452,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.q.a.b.m.b:
+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 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
@@ -12466,7 +12467,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.q.a.b.m.c:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.p.a.b.m.c:
     java.lang.String deferredName -> f
     java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> i
     int[] stack -> b
@@ -12519,7 +12520,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.q.a.b.m.d:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.p.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
@@ -12833,122 +12834,126 @@
 com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.b:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
-    java.util.List markers -> f
-    com.android.tools.r8.DexIndexedConsumer programConsumer -> h
-    boolean $assertionsDisabled -> j
+    com.android.tools.r8.DexIndexedConsumer programConsumer -> i
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.GraphLense graphLense -> c
+    com.android.tools.r8.dex.CodeToKeep desugaredLibraryCodeToKeep -> f
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.naming.NamingLens namingLens -> d
-    java.util.List markerStrings -> g
-    com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> i
+    java.util.List markerStrings -> h
+    java.util.List markers -> g
+    com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> j
     1:1:void <clinit>():67:67 -> <clinit>
-    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):145:145 -> <init>
-    2:12: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):164:174 -> <init>
-    1:2:void encodeChecksums(java.lang.Iterable):204:205 -> a
+    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 encodeChecksums(java.lang.Iterable):205 -> a
-    4:4:void encodeChecksums(java.lang.Iterable):206:206 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    5:5:void encodeChecksums(java.lang.Iterable):207 -> a
-    6:13:void encodeChecksums(java.lang.Iterable):207:214 -> a
-    14:44:void write(java.util.concurrent.ExecutorService):219:249 -> a
-    45:57:void write(java.util.concurrent.ExecutorService):247:259 -> a
-    58:122:void write(java.util.concurrent.ExecutorService):258:322 -> a
-    123:131:void write(java.util.concurrent.ExecutorService):316:324 -> a
-    132:132:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):252:252 -> a
-    133:137:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):263:267 -> a
-    138:138:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():353:353 -> a
-    138:138:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):267 -> a
-    139:146:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):270:277 -> a
-    147:147:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():349:349 -> a
-    147:147:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):277 -> a
-    148:151:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):281:284 -> a
-    152:152:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):283:283 -> a
-    153:158: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):578:583 -> a
-    153:158:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):286 -> a
-    159:167:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):287:295 -> a
-    168:178:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):292:302 -> a
-    179:188:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):299:308 -> a
-    189:192: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):335:338 -> a
-    193:199: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):336:342 -> a
-    200:202:boolean validateProguardMapParses(java.lang.String):445:447 -> a
-    200:202: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 -> a
-    203:210: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:349 -> a
-    211:258: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):348:395 -> a
-    259:259: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):394:394 -> a
-    260:260: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):371:371 -> a
-    261:270: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):370:379 -> a
-    271:279: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):374:382 -> a
-    280:280: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):373:373 -> a
-    281:281: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):372:372 -> a
-    282:315:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):405:438 -> a
-    316:329:void insertAttributeAnnotations():455:468 -> a
-    330:330:void insertAttributeAnnotations():467:467 -> a
-    331:339:void insertAttributeAnnotations():466:474 -> a
-    340:340:void insertAttributeAnnotations():473:473 -> a
-    341:357:void insertAttributeAnnotations():472:488 -> a
-    358:364:void insertAttributeAnnotations():487:493 -> a
-    365:374: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
-    365:374:void insertAttributeAnnotations():491 -> a
-    375:383:void insertAttributeAnnotations():490:498 -> a
-    384:384:void insertAttributeAnnotations():497:497 -> a
-    385:396:void insertAttributeAnnotations():496:507 -> a
-    397:407:void insertAttributeAnnotations():506:516 -> a
-    408:408: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
-    408:408:void insertAttributeAnnotations():514 -> a
-    409:409:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    409:409:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
-    409:409:void insertAttributeAnnotations():514 -> a
-    410:411: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
-    410:411:void insertAttributeAnnotations():514 -> a
-    412:421:void insertAttributeAnnotations():514:523 -> a
-    422:424:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):539:541 -> a
-    425:425:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    425:425:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):542 -> a
-    426:427:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):545:546 -> a
-    428:428:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    428:428:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):547 -> a
-    429:432:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):552:555 -> a
-    433:433:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
-    433:433:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):571 -> a
-    434:444: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):557:567 -> a
-    445:446:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):587:588 -> a
-    445:446:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):596 -> a
-    447:447:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):596:596 -> a
-    448:453:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):592:597 -> a
-    1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):181:181 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():341:341 -> b
-    2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):181 -> b
-    3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):182:182 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():353:353 -> b
-    4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183 -> b
-    5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183:193 -> b
+    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
+    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
+    3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):184:184 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():345:345 -> b
+    4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):185 -> b
+    5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):185:195 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     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):410:410 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):413:416 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):422:422 -> 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):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
     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):422 -> visit
-    7:12:void visit(com.android.tools.r8.DataEntryResource):427:432 -> visit
-    13:16:void visit(com.android.tools.r8.DataEntryResource):431:434 -> 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
     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):422 -> visit
+    17:17:void visit(com.android.tools.r8.DataEntryResource):429 -> visit
 com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.dex.b$b:
-    1:1:void <init>():80:80 -> <init>
-    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):80:80 -> <init>
+    1:1:void <init>():81:81 -> <init>
+    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):81:81 -> <init>
     boolean add(com.android.tools.r8.graph.DexCode) -> a
     boolean add(com.android.tools.r8.graph.DexDebugInfo) -> a
     boolean add(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean add(com.android.tools.r8.graph.DexTypeList) -> a
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
-    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):85:85 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):92:92 -> a
-    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):99:100 -> a
+    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):86:86 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):93:93 -> a
+    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):100:101 -> a
 com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.dex.c:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.dex.CompatByteBuffer buffer -> b
@@ -12990,7 +12995,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):23:24 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):25 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26:28 -> a
     void recordClassAllAccesses(com.android.tools.r8.graph.DexType) -> b
@@ -13011,9 +13016,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):321:328 -> 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: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):326:330 -> 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: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
@@ -13320,7 +13325,7 @@
     150:150:void ensureCodesInited(int):161 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):642 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):643:657 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):657 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):658:661 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13744,278 +13749,275 @@
     com.android.tools.r8.dex.FileWriter$MixedSectionOffsets mixedSectionOffsets -> g
     com.android.tools.r8.graph.DexApplication application -> c
     1:1:void <clinit>():74:74 -> <clinit>
-    1:9:void <init>(com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):104:112 -> <init>
+    1:9:void <init>(com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.dex.CodeToKeep):105:113 -> <init>
     1:1:com.android.tools.r8.dex.FileWriter$MixedSectionOffsets access$300(com.android.tools.r8.dex.FileWriter):74:74 -> a
-    2:3:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):117:118 -> a
+    2:3:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):118:119 -> a
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    4:4:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):118 -> a
-    5:5:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120:120 -> a
+    4:4:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):119 -> a
+    5:5:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> a
     6:6:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    6:6:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
-    7:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> a
+    6:6:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
+    7:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:122 -> a
     8:8:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    8:8:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
-    9:9:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:122 -> a
+    8:8:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
+    9:9:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):123:123 -> a
     10:10:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
-    10:10:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
-    11:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
+    10:10:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):123 -> a
+    11:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):123:125 -> a
     14:14:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
-    15:15:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125 -> a
+    15:15:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):126:126 -> a
     16:16:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    16:16:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
-    17:17:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
-    18:38:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
-    39:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
+    16:16:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
+    17:17:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):123:123 -> a
+    18:38:com.android.tools.r8.dex.FileWriter collect():132:152 -> a
+    39:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):251:288 -> a
     77:77:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    77:77:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
-    78:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    79:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
+    77:77:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):288 -> a
+    78:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
+    79:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):264:265 -> a
     81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    81:81:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    82:82:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
-    83:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
-    89:95:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:351 -> a
-    89:95:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    96:98:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
-    99:103:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
-    104:105:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
-    106:108:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
-    109:116:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
-    117:124:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
-    125:126:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
-    127:141:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
+    81:81:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):265 -> a
+    82:82:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):265:265 -> a
+    83:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):319:324 -> a
+    89:95:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):340:346 -> a
+    89:95:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):323 -> a
+    96:98:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):351:353 -> a
+    99:103:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):372:376 -> a
+    104:105:void writeTypeItem(com.android.tools.r8.graph.DexType):425:426 -> a
+    106:108:void writeProtoItem(com.android.tools.r8.graph.DexProto):430:432 -> a
+    109:116:void writeFieldItem(com.android.tools.r8.graph.DexField):436:443 -> a
+    117:124:void writeMethodItem(com.android.tools.r8.graph.DexMethod):447:454 -> a
+    125:126:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):472:473 -> a
+    127:141:void writeCodeItem(com.android.tools.r8.graph.DexCode):477:491 -> a
     142:142:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):166:166 -> a
-    142:142:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
-    143:151:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
+    142:142:void writeCodeItem(com.android.tools.r8.graph.DexCode):491 -> a
+    143:151:void writeCodeItem(com.android.tools.r8.graph.DexCode):492:500 -> a
     152:152:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    152:152:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    153:158:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
+    152:152:void writeCodeItem(com.android.tools.r8.graph.DexCode):500 -> a
+    153:158:void writeCodeItem(com.android.tools.r8.graph.DexCode):501:506 -> a
     159:159:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    159:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    160:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
+    159:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):506 -> a
+    160:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):507:508 -> a
     162:162:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):508 -> a
+    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):509:509 -> a
     164:164:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
+    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):509 -> a
     165:165:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):508 -> a
+    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:512 -> a
     167:167:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
+    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):512 -> a
     168:168:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    168:168:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    169:178:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
+    168:168:void writeCodeItem(com.android.tools.r8.graph.DexCode):506 -> a
+    169:178:void writeCodeItem(com.android.tools.r8.graph.DexCode):515:524 -> a
     179:179:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    179:179:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    180:185:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
-    186:187:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
+    179:179:void writeCodeItem(com.android.tools.r8.graph.DexCode):500 -> a
+    180:185:void writeTypeList(com.android.tools.r8.graph.DexTypeList):529:534 -> a
+    186:187:void writeStringData(com.android.tools.r8.graph.DexString):539:540 -> a
     188:188:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    188:188:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    189:189:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    188:188:void writeStringData(com.android.tools.r8.graph.DexString):540 -> a
+    189:189:void writeStringData(com.android.tools.r8.graph.DexString):541:541 -> a
     190:190:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    190:190:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    191:191:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
-    192:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
+    190:190:void writeStringData(com.android.tools.r8.graph.DexString):540 -> a
+    191:191:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):554:554 -> a
+    192:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):554:554 -> a
     193:193:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
-    193:193:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559 -> a
-    194:198:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:563 -> a
+    193:193:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):554 -> a
+    194:198:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):554:558 -> a
     199:199:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    199:199:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
-    200:202:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
-    203:212:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
-    213:215:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
-    216:228:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
-    229:229:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
-    230:235:void writeEncodedFields(java.util.List):611:616 -> a
+    199:199:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):558 -> a
+    200:202:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560:562 -> a
+    203:212:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):567:576 -> a
+    213:215:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):582:584 -> a
+    216:228:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):589:601 -> a
+    229:229:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):598:598 -> a
+    230:235:void writeEncodedFields(java.util.List):606:611 -> a
     236:236:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    236:236:void writeEncodedFields(java.util.List):616 -> a
-    237:237:void writeEncodedFields(java.util.List):618:618 -> a
+    236:236:void writeEncodedFields(java.util.List):611 -> a
+    237:237:void writeEncodedFields(java.util.List):613:613 -> a
     238:238:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    238:238:void writeEncodedFields(java.util.List):618 -> a
-    239:239:void writeEncodedFields(java.util.List):619:619 -> a
+    238:238:void writeEncodedFields(java.util.List):613 -> a
+    239:239:void writeEncodedFields(java.util.List):614:614 -> a
     240:240:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    240:240:void writeEncodedFields(java.util.List):618 -> a
+    240:240:void writeEncodedFields(java.util.List):613 -> a
     241:241:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    241:241:void writeEncodedFields(java.util.List):616 -> a
-    242:247:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
+    241:241:void writeEncodedFields(java.util.List):611 -> a
+    242:247:void writeEncodedMethods(java.util.List,boolean):619:624 -> a
     248:248:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    248:248:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    249:249:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
+    248:248:void writeEncodedMethods(java.util.List,boolean):624 -> a
+    249:249:void writeEncodedMethods(java.util.List,boolean):626:626 -> a
     250:250:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    250:250:void writeEncodedMethods(java.util.List,boolean):631 -> a
-    251:255:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
+    250:250:void writeEncodedMethods(java.util.List,boolean):626 -> a
+    251:255:void writeEncodedMethods(java.util.List,boolean):627:631 -> a
     256:256:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    256:256:void writeEncodedMethods(java.util.List,boolean):636 -> a
-    257:257:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
+    256:256:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    257:257:void writeEncodedMethods(java.util.List,boolean):633:633 -> a
     258:258:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    258:258:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    259:259:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    258:258:void writeEncodedMethods(java.util.List,boolean):633 -> a
+    259:259:void writeEncodedMethods(java.util.List,boolean):636:636 -> a
     260:260:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    260:260:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    260:260:void writeEncodedMethods(java.util.List,boolean):633 -> a
     261:261:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    261:261:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    261:261:void writeEncodedMethods(java.util.List,boolean):626 -> a
     262:262:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    262:262:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    263:269:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
-    270:272:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> a
+    262:262:void writeEncodedMethods(java.util.List,boolean):624 -> a
+    263:269:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):660:666 -> a
+    270:272:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):703:705 -> a
     273:273:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    273:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
-    274:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
+    273:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):705 -> a
+    274:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):707:707 -> a
     275:275:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    275:275:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    276:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
+    275:275:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):707 -> a
+    276:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:709 -> a
     278:278:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    278:278:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    279:285:int writeMapItem(int,int,int):722:728 -> a
-    286:286:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    286:286:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
-    287:288:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
-    289:289:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    289:289:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
-    290:290:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    290:290:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
-    291:296:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
-    297:305:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
+    278:278:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):707 -> a
+    279:285:int writeMapItem(int,int,int):717:723 -> a
+    286:286:void checkThatInvokeCustomIsAllowed():1365:1365 -> a
+    286:286:void writeCallSite(com.android.tools.r8.graph.DexCallSite):697 -> a
+    287:288:void writeCallSite(com.android.tools.r8.graph.DexCallSite):698:699 -> a
+    289:289:void checkThatInvokeCustomIsAllowed():1366:1366 -> a
+    289:289:void writeCallSite(com.android.tools.r8.graph.DexCallSite):697 -> a
+    290:290:void checkThatInvokeCustomIsAllowed():1365:1365 -> a
+    290:290:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):671 -> a
+    291:296:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):673:678 -> a
+    297:305:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):675:683 -> a
     306:306:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    306:306:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
-    307:309:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
+    306:306:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):685 -> a
+    307:309:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):686:688 -> a
     310:310:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
-    310:310:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
-    311:316:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
-    317:317:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    317:317:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
-    1:7:void checkInterfaceMethods():237:243 -> b
-    1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():158 -> b
-    8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161:161 -> b
-    9:22:boolean verifyNames():298:311 -> b
-    9:22:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161 -> b
-    23:33:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():163:173 -> b
-    34:34:int sizeOfCodeItems(java.lang.Iterable):387:387 -> b
-    34:34:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173 -> b
-    35:57:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):397:419 -> b
-    35:57:int sizeOfCodeItems(java.lang.Iterable):389 -> b
-    35:57:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173 -> b
+    310:310:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):688 -> a
+    311:316:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):688:693 -> a
+    317:317:void checkThatInvokeCustomIsAllowed():1366:1366 -> a
+    317:317:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):671 -> a
+    1:7:void checkInterfaceMethods():232:238 -> b
+    1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():159 -> b
+    8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():162:162 -> b
+    9:22:boolean verifyNames():293:306 -> b
+    9:22:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():162 -> b
+    23:33:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():164:174 -> b
+    34:34:int sizeOfCodeItems(java.lang.Iterable):382:382 -> b
+    34:34:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
+    35:57:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):392:414 -> b
+    35:57:int sizeOfCodeItems(java.lang.Iterable):384 -> b
+    35:57:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
     58:58:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    58:58:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):420 -> b
-    58:58:int sizeOfCodeItems(java.lang.Iterable):389 -> b
-    58:58:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173 -> b
-    59:60:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173:174 -> b
-    61:61:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    61:61:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
-    62:72:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():178:188 -> b
-    73:73:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    73:73:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():188 -> b
-    74:74:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():189:189 -> b
-    75:75:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    75:75:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():189 -> b
-    76:76:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():191:191 -> b
-    77:77:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    77:77:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():191 -> b
-    78:78:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():193:193 -> b
-    79:79:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    79:79:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():193 -> b
-    80:80:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():195:195 -> b
-    81:81:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    81:81:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():195 -> b
-    82:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():197:205 -> b
-    91:96:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):733:738 -> b
-    91:96:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    97:100:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):737:740 -> b
-    97:100:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    101:104:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):739:742 -> b
-    101:104:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    105:108:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):741:744 -> b
-    105:108:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    109:112:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):743:746 -> b
-    109:112:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    113:116:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):745:748 -> b
-    113:116:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    117:120:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):747:750 -> b
-    117:120:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    121:124:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):749:752 -> b
-    121:124:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    125:128:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):751:754 -> b
-    125:128:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    129:132:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):753:756 -> b
-    129:132:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    133:136:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):755:758 -> b
-    133:136:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    137:140:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):757:760 -> b
-    137:140:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    141:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):759:762 -> b
-    141:144:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    145:148:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):761:764 -> b
-    145:148:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    149:152:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):763:766 -> b
-    149:152:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    153:156:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):765:768 -> b
-    153:156:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    157:161:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):767:771 -> b
-    157:161:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    162:167:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):769:774 -> b
-    162:167:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    168:174:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):772:778 -> b
-    168:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    175:184:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207:216 -> b
-    185:187:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):364:366 -> b
-    185:187:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    188:190:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217:219 -> b
-    191:191:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218:218 -> b
-    192:198:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):782:788 -> b
-    192:198:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222 -> b
-    199:200:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):787:788 -> b
-    199:200:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222 -> b
-    201:235:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):784:818 -> b
-    201:235:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222 -> b
-    236:238:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):823:825 -> b
-    236:238:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
-    239:241:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):824:826 -> b
-    239:241:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
-    242:244:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):833:835 -> b
-    242:244:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
-    245:248:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
-    245:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
-    249:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> b
-    251:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
-    252:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
-    258:258:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
-    258:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
-    259:259:void writeStringItem(com.android.tools.r8.graph.DexString):426:426 -> b
-    260:262:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):550:552 -> b
-    263:263:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    263:263:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):552 -> b
-    264:265:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):554:555 -> b
-    266:266:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):605:605 -> b
-    267:273:void writeClassData(com.android.tools.r8.graph.DexProgramClass):647:653 -> b
-    274:274:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    274:274:void writeClassData(com.android.tools.r8.graph.DexProgramClass):653 -> b
-    275:275:void writeClassData(com.android.tools.r8.graph.DexProgramClass):654:654 -> b
-    276:276:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    276:276:void writeClassData(com.android.tools.r8.graph.DexProgramClass):654 -> b
-    277:277:void writeClassData(com.android.tools.r8.graph.DexProgramClass):655:655 -> b
+    58:58:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):415 -> b
+    58:58:int sizeOfCodeItems(java.lang.Iterable):384 -> b
+    58:58:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
+    59:60:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174:175 -> b
+    61:61:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    61:61:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():175 -> b
+    62:72:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():179:189 -> b
+    73:73:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    73:73:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():189 -> b
+    74:74:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():190:190 -> b
+    75:75:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    75:75:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():190 -> b
+    76:76:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():192:192 -> b
+    77:77:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    77:77:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():192 -> b
+    78:78:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():194:194 -> b
+    79:79:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    79:79:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():194 -> b
+    80:80:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():196:196 -> b
+    81:81:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    81:81:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():196 -> b
+    82:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():198:206 -> b
+    91:96:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):728:733 -> b
+    91:96:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    97:100:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):732:735 -> b
+    97:100:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    101:104:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):734:737 -> b
+    101:104:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    105:108:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):736:739 -> b
+    105:108:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    109:112:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):738:741 -> b
+    109:112:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    113:116:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):740:743 -> b
+    113:116:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    117:120:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):742:745 -> b
+    117:120:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    121:124:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):744:747 -> b
+    121:124:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    125:128:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):746:749 -> b
+    125:128:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    129:132:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):748:751 -> b
+    129:132:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    133:136:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):750:753 -> b
+    133:136:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    137:140:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):752:755 -> b
+    137:140:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    141:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):754:757 -> b
+    141:144:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    145:148:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):756:759 -> b
+    145:148:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    149:152:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):758:761 -> b
+    149:152:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    153:156:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):760:763 -> b
+    153:156:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    157:161:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):762:766 -> b
+    157:161:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    162:167:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):764:769 -> b
+    162:167:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    168:174:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):767:773 -> b
+    168:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    175:184:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():208:217 -> b
+    185:187:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):359:361 -> b
+    185:187:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
+    188:190:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218:220 -> b
+    191:191:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():219:219 -> b
+    192:198:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):777:783 -> b
+    192:198:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
+    199:200:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):782:783 -> b
+    199:200:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
+    201:235:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):779:813 -> b
+    201:235:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
+    236:238:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):818:820 -> b
+    236:238:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
+    239:241:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):819:821 -> b
+    239:241:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
+    242:244:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):828:830 -> b
+    242:244:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> b
+    245:248:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):829:832 -> b
+    245:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> b
+    249:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:228 -> b
+    250:250:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):823:823 -> b
+    250:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
+    251:251:void writeStringItem(com.android.tools.r8.graph.DexString):421:421 -> b
+    252:254:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):545:547 -> b
+    255:255:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    255:255:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):547 -> b
+    256:257:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):549:550 -> b
+    258:258:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):600:600 -> b
+    259:265:void writeClassData(com.android.tools.r8.graph.DexProgramClass):642:648 -> b
+    266:266:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    266:266:void writeClassData(com.android.tools.r8.graph.DexProgramClass):648 -> b
+    267:267:void writeClassData(com.android.tools.r8.graph.DexProgramClass):649:649 -> b
+    268:268:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    268:268:void writeClassData(com.android.tools.r8.graph.DexProgramClass):649 -> b
+    269:269:void writeClassData(com.android.tools.r8.graph.DexProgramClass):650:650 -> b
+    270:270:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    270:270:void writeClassData(com.android.tools.r8.graph.DexProgramClass):650 -> b
+    271:271:void writeClassData(com.android.tools.r8.graph.DexProgramClass):651:651 -> b
+    272:272:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    272:272:void writeClassData(com.android.tools.r8.graph.DexProgramClass):651 -> b
+    273:277:void writeClassData(com.android.tools.r8.graph.DexProgramClass):652:656 -> b
     278:278:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    278:278:void writeClassData(com.android.tools.r8.graph.DexProgramClass):655 -> b
-    279:279:void writeClassData(com.android.tools.r8.graph.DexProgramClass):656:656 -> b
+    278:278:void writeClassData(com.android.tools.r8.graph.DexProgramClass):651 -> b
+    279:279:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    279:279:void writeClassData(com.android.tools.r8.graph.DexProgramClass):650 -> b
     280:280:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    280:280:void writeClassData(com.android.tools.r8.graph.DexProgramClass):656 -> b
-    281:285:void writeClassData(com.android.tools.r8.graph.DexProgramClass):657:661 -> b
-    286:286:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    286:286:void writeClassData(com.android.tools.r8.graph.DexProgramClass):656 -> b
-    287:287:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    287:287:void writeClassData(com.android.tools.r8.graph.DexProgramClass):655 -> b
-    288:288:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    288:288:void writeClassData(com.android.tools.r8.graph.DexProgramClass):654 -> b
-    289:289:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    289:289:void writeClassData(com.android.tools.r8.graph.DexProgramClass):653 -> b
-    1:15:java.util.List sortDexCodesByClassName():319:333 -> c
-    16:19:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):463:466 -> c
-    20:24:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):465:469 -> c
-    25:29:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):468:472 -> c
-    30:32:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):471:473 -> c
-    33:33:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):607:607 -> c
+    280:280:void writeClassData(com.android.tools.r8.graph.DexProgramClass):649 -> b
+    281:281:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    281:281:void writeClassData(com.android.tools.r8.graph.DexProgramClass):648 -> b
+    1:15:java.util.List sortDexCodesByClassName():314:328 -> c
+    16:19:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):458:461 -> c
+    20:24:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):460:464 -> c
+    25:29:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):463:467 -> c
+    30:32:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):466:468 -> c
+    33:33:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):602:602 -> c
 com.android.tools.r8.dex.FileWriter$1 -> com.android.tools.r8.dex.q:
 com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.dex.r$a:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
@@ -14045,39 +14047,39 @@
     int encodedArrarysOffset -> s
     int annotationSetRefListsOffset -> p
     int annotationDirectoriesOffset -> q
-    1:1:void <clinit>():845:845 -> <clinit>
-    1:1:void <init>(int,int,int,int,int,int,int,int,int):877:877 -> <init>
-    2:35:void <init>(int,int,int,int,int,int,int,int,int):861:894 -> <init>
+    1:1:void <clinit>():840:840 -> <clinit>
+    1:1:void <init>(int,int,int,int,int,int,int,int,int):872:872 -> <init>
+    2:35:void <init>(int,int,int,int,int,int,int,int,int):856:889 -> <init>
     void alreadySetOffset(int) -> a
-    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):899:908 -> a
-    11:11:boolean isValidOffset(int,boolean):918:918 -> a
-    12:13:int getAnnotationDirectoriesOffset():996:997 -> a
-    1:2:int getAnnotationSetRefListsOffset():986:987 -> b
-    3:4:void setAnnotationDirectoriesOffset(int):1001:1002 -> b
-    1:2:int getAnnotationSetsOffset():972:973 -> c
-    3:4:void setAnnotationSetRefListsOffset(int):991:992 -> c
-    1:2:int getAnnotationsOffset():962:963 -> d
-    3:4:void setAnnotationSetsOffset(int):981:982 -> d
-    1:2:void setAnnotationsOffset(int):967:968 -> e
-    3:4:int getClassDataOffset():1006:1007 -> e
-    1:2:int getCodesOffset():922:923 -> f
-    3:4:void setClassDataOffset(int):1011:1012 -> f
-    1:2:void setCodesOffset(int):927:928 -> g
-    3:3:int getEndOfFile():1034:1034 -> g
-    3:3:int getDataSectionSize():912 -> g
-    4:5:int getDataSectionSize():912:913 -> g
-    1:2:int getDebugInfosOffset():932:933 -> h
-    3:4:void setDebugInfosOffset(int):937:938 -> h
-    1:2:int getEncodedArrarysOffset():1016:1017 -> i
-    3:4:void setEncodedArrarysOffset(int):1021:1022 -> i
-    1:1:int getEndOfFile():1034:1034 -> j
-    2:2:void setEndOfFile(int):1038:1038 -> j
-    1:1:int getMapOffset():1026:1026 -> k
-    2:2:void setMapOffset(int):1030:1030 -> k
-    1:2:int getStringDataOffsets():952:953 -> l
-    3:4:void setStringDataOffsets(int):957:958 -> l
-    1:2:int getTypeListsOffset():942:943 -> m
-    3:4:void setTypeListsOffset(int):947:948 -> m
+    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):894:903 -> a
+    11:11:boolean isValidOffset(int,boolean):913:913 -> a
+    12:13:int getAnnotationDirectoriesOffset():991:992 -> a
+    1:2:int getAnnotationSetRefListsOffset():981:982 -> b
+    3:4:void setAnnotationDirectoriesOffset(int):996:997 -> b
+    1:2:int getAnnotationSetsOffset():967:968 -> c
+    3:4:void setAnnotationSetRefListsOffset(int):986:987 -> c
+    1:2:int getAnnotationsOffset():957:958 -> d
+    3:4:void setAnnotationSetsOffset(int):976:977 -> d
+    1:2:void setAnnotationsOffset(int):962:963 -> e
+    3:4:int getClassDataOffset():1001:1002 -> e
+    1:2:int getCodesOffset():917:918 -> f
+    3:4:void setClassDataOffset(int):1006:1007 -> f
+    1:2:void setCodesOffset(int):922:923 -> g
+    3:3:int getEndOfFile():1029:1029 -> g
+    3:3:int getDataSectionSize():907 -> g
+    4:5:int getDataSectionSize():907:908 -> g
+    1:2:int getDebugInfosOffset():927:928 -> h
+    3:4:void setDebugInfosOffset(int):932:933 -> h
+    1:2:int getEncodedArrarysOffset():1011:1012 -> i
+    3:4:void setEncodedArrarysOffset(int):1016:1017 -> i
+    1:1:int getEndOfFile():1029:1029 -> j
+    2:2:void setEndOfFile(int):1033:1033 -> j
+    1:1:int getMapOffset():1021:1021 -> k
+    2:2:void setMapOffset(int):1025:1025 -> k
+    1:2:int getStringDataOffsets():947:948 -> l
+    3:4:void setStringDataOffsets(int):952:953 -> l
+    1:2:int getTypeListsOffset():937:938 -> m
+    3:4:void setTypeListsOffset(int):942:943 -> m
 com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.dex.t:
     boolean $assertionsDisabled -> n
     int minApiLevel -> m
@@ -14093,76 +14095,76 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap classesWithData -> j
     java.util.Map clazzToAnnotationDirectory -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap encodedArrays -> k
-    1:1:void <clinit>():1049:1049 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1049:1049 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1085:1085 -> <init>
-    3:34:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1056:1087 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1049:1049 -> a
-    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1091:1092 -> a
-    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1108:1108 -> a
-    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1113:1113 -> a
-    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1120:1123 -> a
-    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1128:1128 -> a
-    11:11:boolean add(com.android.tools.r8.graph.DexCode):1133:1133 -> a
-    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1099:1100 -> a
-    12:13:boolean add(com.android.tools.r8.graph.DexCode):1133 -> a
-    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1138:1138 -> a
-    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1143:1146 -> a
-    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1151:1154 -> a
-    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1159:1159 -> a
-    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1165:1167 -> a
-    27:27:boolean add(com.android.tools.r8.graph.DexString):1171:1171 -> a
-    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1099:1100 -> a
-    28:29:boolean add(com.android.tools.r8.graph.DexString):1171 -> a
-    30:30:java.util.Collection getAnnotationDirectories():1207:1207 -> a
-    31:32:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1218:1219 -> a
-    33:34:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1227:1228 -> a
-    35:36:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1290:1291 -> a
-    37:37:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1300:1300 -> a
-    38:38:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1304:1304 -> a
-    39:40:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1295:1296 -> a
-    39:40:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1304 -> a
-    41:42:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1308:1309 -> a
-    43:43:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1313:1313 -> a
-    44:45:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1295:1296 -> a
-    44:45:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1313 -> a
-    46:46:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1317:1317 -> a
-    47:48:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1323:1324 -> a
-    49:49:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1328:1328 -> a
-    50:50:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1332:1332 -> a
-    51:51:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1336:1336 -> a
-    52:53:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1340:1341 -> a
-    1:1:java.util.Collection getAnnotationSetRefLists():1199:1199 -> b
-    2:2:int getOffsetFor(com.android.tools.r8.graph.DexString):1233:1233 -> b
-    3:6:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1237:1240 -> b
-    7:7:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1244:1244 -> b
-    8:8:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1248:1248 -> b
-    9:9:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1252:1252 -> b
-    10:10:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1266:1266 -> b
-    11:14:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1272:1275 -> b
-    15:18:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1279:1282 -> b
-    19:19:int getOffsetFor(com.android.tools.r8.graph.DexCode):1286:1286 -> b
-    1:1:java.util.Collection getAnnotationSets():1195:1195 -> c
-    2:6:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1257:1261 -> c
-    1:1:java.util.Collection getAnnotations():1191:1191 -> d
-    1:1:java.util.Collection getClassesWithData():1203:1203 -> e
-    1:1:java.util.Collection getCodes():1175:1175 -> f
-    1:1:java.util.Collection getDebugInfos():1179:1179 -> g
-    1:1:java.util.Collection getEncodedArrays():1211:1211 -> h
-    1:1:java.util.Collection getStringData():1187:1187 -> i
-    1:1:java.util.Collection getTypeLists():1183:1183 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1074:1075 -> k
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1080:1080 -> l
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1044:1044 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1080:1080 -> <init>
+    3:34:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1051:1082 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1044:1044 -> a
+    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1086:1087 -> a
+    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1103:1103 -> a
+    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1108:1108 -> a
+    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1115:1118 -> a
+    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1123:1123 -> a
+    11:11:boolean add(com.android.tools.r8.graph.DexCode):1128:1128 -> a
+    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1094:1095 -> a
+    12:13:boolean add(com.android.tools.r8.graph.DexCode):1128 -> a
+    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1133:1133 -> a
+    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1138:1141 -> a
+    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1146:1149 -> a
+    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1154:1154 -> a
+    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1160:1162 -> a
+    27:27:boolean add(com.android.tools.r8.graph.DexString):1166:1166 -> a
+    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1094:1095 -> a
+    28:29:boolean add(com.android.tools.r8.graph.DexString):1166 -> a
+    30:30:java.util.Collection getAnnotationDirectories():1202:1202 -> a
+    31:32:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1213:1214 -> a
+    33:34:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1222:1223 -> a
+    35:36:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1285:1286 -> a
+    37:37:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1295:1295 -> a
+    38:38:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1299:1299 -> a
+    39:40:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1290:1291 -> a
+    39:40:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1299 -> a
+    41:42:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1303:1304 -> a
+    43:43:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1308:1308 -> a
+    44:45:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1290:1291 -> a
+    44:45:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1308 -> a
+    46:46:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1312:1312 -> a
+    47:48:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1318:1319 -> a
+    49:49:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1323:1323 -> a
+    50:50:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1327:1327 -> a
+    51:51:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1331:1331 -> a
+    52:53:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1335:1336 -> a
+    1:1:java.util.Collection getAnnotationSetRefLists():1194:1194 -> b
+    2:2:int getOffsetFor(com.android.tools.r8.graph.DexString):1228:1228 -> b
+    3:6:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1232:1235 -> b
+    7:7:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1239:1239 -> b
+    8:8:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1243:1243 -> b
+    9:9:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1247:1247 -> b
+    10:10:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1261:1261 -> b
+    11:14:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1267:1270 -> b
+    15:18:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1274:1277 -> b
+    19:19:int getOffsetFor(com.android.tools.r8.graph.DexCode):1281:1281 -> b
+    1:1:java.util.Collection getAnnotationSets():1190:1190 -> c
+    2:6:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1252:1256 -> c
+    1:1:java.util.Collection getAnnotations():1186:1186 -> d
+    1:1:java.util.Collection getClassesWithData():1198:1198 -> e
+    1:1:java.util.Collection getCodes():1170:1170 -> f
+    1:1:java.util.Collection getDebugInfos():1174:1174 -> g
+    1:1:java.util.Collection getEncodedArrays():1206:1206 -> h
+    1:1:java.util.Collection getStringData():1182:1182 -> i
+    1:1:java.util.Collection getTypeLists():1178:1178 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1069:1070 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1075:1075 -> l
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():176:176 -> l
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1080 -> l
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1081:1081 -> l
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1075 -> l
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1076:1076 -> l
 com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.dex.u:
     java.util.Set includedClasses -> c
     com.android.tools.r8.dex.FileWriter this$0 -> d
-    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1349:1350 -> <init>
-    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1347:1351 -> <init>
+    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1344:1345 -> <init>
+    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1342:1346 -> <init>
     void visit(com.android.tools.r8.graph.DexType) -> a
-    1:4:void visit(com.android.tools.r8.graph.DexClass):1362:1365 -> a
+    1:4:void visit(com.android.tools.r8.graph.DexClass):1357:1360 -> a
 com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.dex.v:
 com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.dex.z:
     com.android.tools.r8.dex.VirtualFile mainDex -> b
@@ -14208,7 +14210,7 @@
     99:99:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):447 -> a
     100:103:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):450:453 -> a
     104:104:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):442:442 -> a
-    105:105:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    105:105:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     105:105:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443 -> a
     106:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443:443 -> a
     107:107:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -14255,7 +14257,7 @@
     49:49:void markDexFull(com.android.tools.r8.dex.VirtualFile):716:716 -> b
     49:49:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643 -> b
     50:50:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):637:637 -> b
-    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> b
+    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> b
     51:51:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638 -> b
     52:52:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638:638 -> b
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -15245,7 +15247,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.r.a:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.q.a:
     java.util.List featureSplits -> a
     java.util.Map javaTypeToFeatureSplitMapping -> b
     boolean $assertionsDisabled -> c
@@ -15266,7 +15268,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.r.a$a:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.q.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>
@@ -15275,7 +15277,7 @@
 com.android.tools.r8.graph.AccessControl -> com.android.tools.r8.graph.a:
     1:1:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):42 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     2:2:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):18 -> a
     2:2:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):42 -> a
     3:3:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):18:18 -> a
@@ -15283,161 +15285,165 @@
     4:7:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):45:48 -> a
     8:11:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):64:67 -> a
     8:11:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):49 -> a
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     12:12:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):51 -> a
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     13:13:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):51 -> a
     14:17:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):51:54 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     18:18:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):57 -> a
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     19:19:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):57 -> a
     20:20:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):57:57 -> a
     21:21:boolean isMethodAccessible(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):26:26 -> a
     22:22:boolean isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):34:34 -> a
 com.android.tools.r8.graph.AccessFlags -> com.android.tools.r8.graph.b:
-    java.util.List NAMES -> c
-    int modifiedFlags -> b
-    boolean $assertionsDisabled -> d
-    int originalFlags -> a
-    1:12:void <clinit>():12:23 -> <clinit>
-    1:3:void <init>(int,int):51:53 -> <init>
-    1:7:int visibilityOrdinal():110:116 -> A
-    1:5:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):88:92 -> a
-    6:6:boolean isVisibilityDependingOnPackage():124:124 -> a
-    6:6:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):93 -> a
-    7:7:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):94:94 -> a
-    8:8:boolean isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):101:101 -> a
-    9:9:boolean isSet(int):224:224 -> a
-    10:10:void demote(int):246:246 -> a
-    10:10:void demoteFromFinal():203 -> a
-    11:24:java.lang.String toStringInternal(boolean):259:272 -> a
-    1:1:java.util.List getNames():45:45 -> b
-    2:2:boolean isSameVisibility(com.android.tools.r8.graph.AccessFlags):105:105 -> b
-    3:3:void promote(int):242:242 -> b
-    1:1:int getOriginalAccessFlags():69:69 -> c
-    2:3:void set(int):228:229 -> c
-    1:1:java.util.List getPredicates():34:34 -> d
-    2:3:void unset(int):233:234 -> d
-    1:1:boolean isFinal():175:175 -> e
-    1:3:boolean equals(java.lang.Object):74:76 -> equals
-    1:1:boolean isPrivate():141:141 -> f
-    1:1:boolean wasSet(int):220:220 -> g
-    1:1:boolean isPromoted(int):238 -> g
-    1:1:boolean isPromotedToPublic():207 -> g
-    2:2:boolean isSet(int):224:224 -> g
-    2:2:boolean isPromoted(int):238 -> g
-    2:2:boolean isPromotedToPublic():207 -> g
-    1:1:boolean isProtected():154:154 -> h
-    1:1:int hashCode():83:83 -> hashCode
-    1:1:boolean isPublic():128:128 -> i
-    1:1:boolean isStatic():167:167 -> j
-    1:1:boolean isSynthetic():187:187 -> k
-    1:1:int materialize():61:61 -> l
-    1:1:void promoteToFinal():199:199 -> m
-    1:1:void demote(int):246:246 -> n
-    1:1:void promoteToPublic():211 -> n
-    2:2:void promoteToPublic():212:212 -> n
-    1:1:void promoteToStatic():216:216 -> o
-    1:1:void setFinal():179:179 -> p
-    1:2:void setPrivate():145:146 -> q
-    1:2:void setProtected():158:159 -> r
-    1:2:void setPublic():132:133 -> s
-    1:1:void setStatic():171:171 -> t
-    1:1:java.lang.String toString():255:255 -> toString
-    1:1:void setSynthetic():191:191 -> u
-    1:1:java.lang.String toSmaliString():250:250 -> v
-    1:1:void unsetPrivate():150:150 -> w
-    1:1:void unsetProtected():163:163 -> x
-    1:1:void unsetPublic():137:137 -> y
-    1:1:void unsetSynthetic():195:195 -> z
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[] EMPTY_FLAG -> a
+    java.util.List NAMES -> d
+    boolean $assertionsDisabled -> e
+    int originalFlags -> b
+    int modifiedFlags -> c
+    1:14:void <clinit>():16:29 -> <clinit>
+    1:1:void <init>(int,int):57:57 -> <init>
+    2:43:void <init>(int,int):18:59 -> <init>
+    1:7:int visibilityOrdinal():136:142 -> A
+    1:5:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):114:118 -> a
+    6:6:boolean isVisibilityDependingOnPackage():150:150 -> a
+    6:6:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):119 -> a
+    7:7:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):120:120 -> a
+    8:8:boolean isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):127:127 -> a
+    9:9:boolean isSet(int):254:254 -> a
+    10:10:void demote(int):276:276 -> a
+    10:10:void demoteFromFinal():233 -> a
+    11:24:java.lang.String toStringInternal(boolean):289:302 -> a
+    1:1:java.util.List getNames():51:51 -> b
+    2:2:boolean isSameVisibility(com.android.tools.r8.graph.AccessFlags):131:131 -> b
+    3:3:void promote(int):272:272 -> b
+    1:1:int getOriginalAccessFlags():95:95 -> c
+    2:3:void set(int):258:259 -> c
+    1:1:java.util.List getPredicates():40:40 -> d
+    2:3:void unset(int):263:264 -> d
+    1:1:boolean isFinal():205:205 -> e
+    1:3:boolean equals(java.lang.Object):100:102 -> equals
+    1:1:boolean isPrivate():167:167 -> f
+    1:1:boolean wasSet(int):250:250 -> g
+    1:1:boolean isPromoted(int):268 -> g
+    1:1:boolean isPromotedToPublic():237 -> g
+    2:2:boolean isSet(int):254:254 -> g
+    2:2:boolean isPromoted(int):268 -> g
+    2:2:boolean isPromotedToPublic():237 -> g
+    1:1:boolean isProtected():180:180 -> h
+    1:1:int hashCode():109:109 -> hashCode
+    1:1:boolean isPublic():154:154 -> i
+    1:1:boolean isStatic():193:193 -> j
+    1:1:boolean isSynthetic():217:217 -> k
+    1:1:int materialize():67:67 -> l
+    1:1:void promoteToFinal():229:229 -> m
+    1:1:void demote(int):276:276 -> n
+    1:1:void promoteToPublic():241 -> n
+    2:2:void promoteToPublic():242:242 -> n
+    1:1:void promoteToStatic():246:246 -> o
+    1:1:void setFinal():209:209 -> p
+    1:2:void setPrivate():171:172 -> q
+    1:2:void setProtected():184:185 -> r
+    1:2:void setPublic():158:159 -> s
+    1:1:void setStatic():197:197 -> t
+    1:1:java.lang.String toString():285:285 -> toString
+    1:1:void setSynthetic():221:221 -> u
+    1:1:java.lang.String toSmaliString():280:280 -> v
+    1:1:void unsetPrivate():176:176 -> w
+    1:1:void unsetProtected():189:189 -> x
+    1:1:void unsetPublic():163:163 -> y
+    1:1:void unsetSynthetic():225:225 -> z
 com.android.tools.r8.graph.AppInfo -> com.android.tools.r8.graph.c:
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):40:40 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexApplication):30:42 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.AppInfo):45:45 -> <init>
-    16:36:void <init>(com.android.tools.r8.graph.AppInfo):30:50 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory access$000(com.android.tools.r8.graph.AppInfo):26:26 -> a
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):42:42 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.DexApplication):32:44 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.AppInfo):47:47 -> <init>
+    16:36:void <init>(com.android.tools.r8.graph.AppInfo):32:52 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory access$000(com.android.tools.r8.graph.AppInfo):28:28 -> a
     2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():100:100 -> a
-    2:2:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):107 -> a
-    3:3:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):107:107 -> a
-    4:10:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):103:109 -> a
-    11:16:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):311:316 -> a
-    17:17:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369:369 -> 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):586:592 -> a
-    18:24:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    25:27:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):608:610 -> 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):599 -> a
-    25:27:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    28:28:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():134:134 -> a
-    28:28:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):610 -> 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):599 -> a
-    28:28:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    29:31:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):610:612 -> 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):599 -> a
-    29:31:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    32:43:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371:382 -> a
-    44:46:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):411:413 -> a
-    47:54:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):419:426 -> a
-    55:55:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):450:450 -> a
-    55:55:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):427 -> a
-    56:66:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):429:439 -> a
-    67:67:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1086:1086 -> a
-    67:67:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):106 -> a
-    68:68:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):106:106 -> a
-    1:5:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):90:94 -> addSynthesizedClass
-    1:2:com.android.tools.r8.graph.DexApplication app():79:80 -> app
-    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):176:182 -> b
-    1:1:boolean checkIfObsolete():74:74 -> checkIfObsolete
-    1:2:java.lang.Iterable classes():113:114 -> classes
-    1:2:java.lang.Iterable classesWithDeterministicOrder():118:119 -> classesWithDeterministicOrder
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):58:58 -> copyMetadataFromPrevious
-    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):124:132 -> definitionFor
-    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):137:143 -> definitionFor
-    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):159:164 -> definitionFor
-    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):171:172 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):148:148 -> definitionForProgramType
-    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():85:86 -> dexItemFactory
-    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():98:99 -> getSynthesizedClassesForSanityCheck
-    1:1:boolean hasLiveness():587:587 -> hasLiveness
-    1:1:boolean hasSubtyping():577:577 -> hasSubtyping
-    1:1:void invalidateTypeCacheFor(com.android.tools.r8.graph.DexType):187:187 -> invalidateTypeCacheFor
-    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):597:598 -> isInMainDexList
-    1:1:boolean isObsolete():62:62 -> isObsolete
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):237:240 -> lookupDirectTarget
-    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):511:514 -> lookupInstanceTarget
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):200:203 -> lookupStaticTarget
-    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):524:527 -> lookupStaticTarget
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):217:220 -> lookupSuperTarget
-    5:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):224:225 -> lookupSuperTarget
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):250:254 -> lookupVirtualTarget
-    1:1:void markObsolete():66:66 -> markObsolete
-    1:1:com.android.tools.r8.utils.InternalOptions options():54:54 -> options
-    1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):152:154 -> originFor
-    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):535:536 -> resolveField
-    1:3:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):546:548 -> resolveFieldOn
-    4:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):552:568 -> resolveFieldOn
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMaximallySpecificMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):393:401 -> resolveMaximallySpecificMethods
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):268:276 -> resolveMethod
-    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):280:282 -> resolveMethod
-    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):297:300 -> resolveMethod
-    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):332:344 -> resolveMethodOnClass
-    14:22:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):348:356 -> resolveMethodOnClass
-    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):465:479 -> resolveMethodOnInterface
-    16:34:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):483:501 -> resolveMethodOnInterface
-    1:1:void unsetObsolete():70:70 -> unsetObsolete
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():592:592 -> withLiveness
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():582:582 -> withSubtyping
+    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
+    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
+    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
+    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
+    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
+    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
+    1:2:com.android.tools.r8.graph.DexApplication app():81:82 -> app
+    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):190:196 -> b
+    1:1:boolean checkIfObsolete():76:76 -> checkIfObsolete
+    1:2:java.lang.Iterable classes():115:116 -> classes
+    1:2:java.lang.Iterable classesWithDeterministicOrder():120:121 -> classesWithDeterministicOrder
+    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):60:60 -> copyMetadataFromPrevious
+    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):126:134 -> definitionFor
+    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):139:145 -> definitionFor
+    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):173:178 -> definitionFor
+    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):185:186 -> definitionFor
+    1:7:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):149:155 -> definitionForDesugarDependency
+    8:8:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):154:154 -> definitionForDesugarDependency
+    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: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: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.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
+    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: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: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
 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>():601:601 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass):613:613 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexClass):611:614 -> <init>
-    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):619:627 -> a
-    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):635:649 -> a
-    25:65:com.android.tools.r8.graph.ResolutionResult resolve():654:694 -> a
+    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
 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>
@@ -15488,7 +15494,7 @@
     1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):604:604 -> isExternalizable
     1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> isMarkedAsInterface
     1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):599:599 -> isMissingOrHasMissingSuperType
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):746:750 -> isMissingOrHasMissingSuperType
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):796:800 -> isMissingOrHasMissingSuperType
     2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):600 -> isMissingOrHasMissingSuperType
     1:3:boolean isRelatedBySubtyping(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):472:474 -> isRelatedBySubtyping
     1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):608:608 -> isSerializable
@@ -15582,12 +15588,13 @@
     13:18:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
 com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.f:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
+    java.util.Map sourceDebugExtensions -> r
     com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> k
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> d
     boolean allCodeProcessed -> l
     com.android.tools.r8.utils.InternalOptions options -> f
-    boolean $assertionsDisabled -> r
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator -> j
+    boolean $assertionsDisabled -> s
     com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
     com.android.tools.r8.ir.desugar.PrefixRewritingMapper rewritePrefix -> i
     com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> q
@@ -15599,77 +15606,79 @@
     com.android.tools.r8.graph.AppInfo appInfo -> a
     com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> n
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> h
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):79:79 -> <init>
-    2:55:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):44:97 -> <init>
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102:102 -> a
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):81:81 -> <init>
+    2:55:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):46:99 -> <init>
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104:104 -> a
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):70 -> a
-    2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102 -> a
-    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):71:71 -> a
-    3:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102 -> a
-    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):65:65 -> a
-    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):107:107 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():120:120 -> a
-    7:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):128:132 -> a
-    12:12:void setAppServices(com.android.tools.r8.graph.AppServices):160:160 -> a
-    13:13:void setClassesEscapingIntoLibrary(java.util.function.Predicate):169:169 -> a
-    14:14:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):194:194 -> a
-    15:16:void withGeneratedExtensionRegistryShrinker(java.util.function.Consumer):231:232 -> a
-    17:18:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):238:239 -> a
-    19:20:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):279:280 -> a
-    21:21:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):288:288 -> a
-    22:23:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):308:309 -> a
-    24:24:void setUnneededVisibilityBridgeMethods(java.util.Set):317:317 -> a
-    25:25:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):339:339 -> a
-    26:26:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):349:349 -> a
-    27:28:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):366:367 -> a
-    29:29:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
-    29:29:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):368 -> a
-    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111:111 -> b
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):72 -> a
+    2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104 -> a
+    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):73:73 -> a
+    3:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104 -> a
+    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):67:67 -> a
+    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104 -> a
+    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):109:109 -> a
+    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():122:122 -> a
+    7:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):130:134 -> a
+    12:12:void setAppServices(com.android.tools.r8.graph.AppServices):154:154 -> a
+    13:13:void setClassesEscapingIntoLibrary(java.util.function.Predicate):163:163 -> a
+    14:14:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):167:167 -> a
+    15:15:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):171:171 -> a
+    16:16:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):196:196 -> a
+    17:18:void withGeneratedExtensionRegistryShrinker(java.util.function.Consumer):233:234 -> a
+    19:20:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):240:241 -> a
+    21:22:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):281:282 -> a
+    23:23:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):290:290 -> a
+    24:25:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):310:311 -> a
+    26:26:void setUnneededVisibilityBridgeMethods(java.util.Set):319:319 -> a
+    27:27:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):341:341 -> a
+    28:28:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):351:351 -> a
+    29:30:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):368:369 -> a
+    31:31:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
+    31:31:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):370 -> a
+    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113:113 -> b
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> b
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):70 -> b
-    2:2:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111 -> b
-    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):71:71 -> b
-    3:3:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111 -> b
-    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):65:65 -> b
-    4:4:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111 -> b
-    5:5:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):116:116 -> b
-    6:7:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):164:165 -> b
-    8:9:void withGeneratedMessageLiteBuilderShrinker(java.util.function.Consumer):252:253 -> b
-    10:11:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):267:268 -> b
-    12:17:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():321:326 -> b
-    1:1:com.android.tools.r8.graph.AppInfo appInfo():124:124 -> c
-    2:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):200:204 -> c
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):72 -> b
+    2:2:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113 -> b
+    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):73:73 -> b
+    3:3:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113 -> b
+    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):67:67 -> b
+    4:4:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113 -> b
+    5:5:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):118:118 -> b
+    6:7:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):158:159 -> b
+    8:9:void withGeneratedMessageLiteBuilderShrinker(java.util.function.Consumer):254:255 -> b
+    10:11:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):269:270 -> b
+    12:17:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():323:328 -> b
+    1:1:com.android.tools.r8.graph.AppInfo appInfo():126:126 -> c
+    2:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):202:206 -> c
     7:7:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> c
-    7:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):205 -> c
-    8:8:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):206:206 -> c
+    7:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):207 -> c
+    8:8:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):208:208 -> c
     9:9:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> c
-    9:9:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):209 -> c
-    10:11:void withGeneratedMessageLiteShrinker(java.util.function.Consumer):245:246 -> c
-    12:13:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):259:260 -> c
-    1:1:com.android.tools.r8.graph.AppServices appServices():156:156 -> d
-    2:3:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):293:294 -> d
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):189:189 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():214:214 -> dexItemFactory
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():222:222 -> e
-    1:1:boolean enableWholeProgramOptimizations():218:218 -> f
-    1:1:com.android.tools.r8.graph.GraphLense graphLense():274:274 -> g
-    1:1:boolean isAllCodeProcessed():140:140 -> h
-    1:1:com.android.tools.r8.utils.InternalOptions options():300:300 -> i
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():226:226 -> j
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():304:304 -> k
-    1:1:void setAllCodeProcessed():144:144 -> l
-    1:1:java.util.Set unneededVisibilityBridgeMethods():313:313 -> m
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():345:345 -> n
+    9:9:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):211 -> c
+    10:11:void withGeneratedMessageLiteShrinker(java.util.function.Consumer):247:248 -> c
+    12:13:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):261:262 -> c
+    1:1:com.android.tools.r8.graph.AppServices appServices():150:150 -> d
+    2:3:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):295:296 -> d
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):191:191 -> definitionFor
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():216:216 -> dexItemFactory
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():224:224 -> e
+    1:1:boolean enableWholeProgramOptimizations():220:220 -> f
+    1:1:com.android.tools.r8.graph.GraphLense graphLense():276:276 -> g
+    1:1:boolean isAllCodeProcessed():142:142 -> h
+    1:1:com.android.tools.r8.utils.InternalOptions options():302:302 -> i
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():228:228 -> j
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():306:306 -> k
+    1:1:void setAllCodeProcessed():146:146 -> l
+    1:1:java.util.Set unneededVisibilityBridgeMethods():315:315 -> m
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():347:347 -> n
     com.android.tools.r8.graph.AppView withLiveness() -> o
-    1:1:com.android.tools.r8.graph.AppView withSubtyping():354:354 -> p
+    1:1:com.android.tools.r8.graph.AppView withSubtyping():356:356 -> p
 com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> com.android.tools.r8.graph.f$a:
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations ON -> a
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations OFF -> b
-    1:2:void <clinit>():33:34 -> <clinit>
-    1:1:void <init>(java.lang.String,int):32:32 -> <init>
+    1:2:void <clinit>():35:36 -> <clinit>
+    1:1:void <init>(java.lang.String,int):34:34 -> <init>
 com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.g:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.com.google.common.collect.BiMap originalTypeNames -> b
@@ -15706,7 +15715,7 @@
     9:21:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):103:115 -> a
     22:23:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):124:125 -> a
     22:23:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):116 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):370:370 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):371:371 -> a
     24:24:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):125 -> a
     24:24:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):116 -> a
     25:26:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):128:129 -> a
@@ -15724,7 +15733,7 @@
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):7:7 -> a
     2:2:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):21:21 -> a
     3:15:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:55 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    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:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):55 -> a
     17:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):57:58 -> a
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> b
@@ -15742,124 +15751,128 @@
     com.android.tools.r8.graph.DexType originalHolder -> a
     int maxStack -> b
     int maxLocals -> c
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):105:111 -> <init>
-    1:1:java.util.List getInstructions():131:131 -> a
-    2:2:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):196:196 -> a
-    3:12:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):175:184 -> a
-    3:12:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):198 -> a
-    13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):199:199 -> a
+    1:1:void <clinit>():43:43 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):109:115 -> <init>
+    1:1:java.util.List getInstructions():135:135 -> a
+    2:2:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200:200 -> a
+    3:12:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):179:188 -> a
+    3:12:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202 -> a
+    13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):203:203 -> a
     14:14:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:47 -> a
-    14:14:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200 -> a
-    15:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202:203 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():328 -> a
-    17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():329:329 -> a
-    18:18:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
-    19:35:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):208:224 -> a
-    36:49:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):218:231 -> a
-    50:56:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):230:236 -> a
-    57:57:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):235:235 -> a
-    58:63:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):248:253 -> a
-    64:64:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):248:248 -> a
-    65:67:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):307:309 -> a
-    68:68:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):308:308 -> a
-    69:70:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):331:332 -> a
-    69:70:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):317 -> a
-    71:82:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):331:342 -> a
-    71:82:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):317 -> a
-    83:83:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):341:341 -> a
-    83:83:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):317 -> a
-    84:93:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):361:370 -> a
-    94:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):486:497 -> a
-    106:106:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
-    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):497 -> a
+    14:14:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):204 -> a
+    15:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):206:207 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():320 -> a
+    17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):209 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():321:321 -> a
+    18:18:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):209 -> a
+    19:35:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):212:228 -> a
+    36:49:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):222:235 -> a
+    50:56:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):234:240 -> a
+    57:57:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):239:239 -> a
+    58:63:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):252:257 -> a
+    64:64:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):252:252 -> a
+    65:67:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):311:313 -> a
+    68:68:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):312:312 -> a
+    69:70:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):335:336 -> a
+    69:70:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
+    71:82:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):335:346 -> a
+    71:82:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
+    83:83:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):345:345 -> a
+    83:83:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
+    84:93:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):365:374 -> a
+    94:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):490:501 -> a
+    106:106:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> a
+    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):501 -> a
     107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):498 -> a
-    108:117:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):499:508 -> a
-    118:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):506:514 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):502 -> a
+    108:117:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):503:512 -> a
+    118:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):510:518 -> a
     127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
-    127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517 -> a
-    128:128:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517:517 -> a
-    1:1:java.util.List getLocalVariables():135:135 -> b
-    2:3:int countNonStackOperations(int):150:151 -> b
-    1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):281:281 -> buildIR
-    1:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):293:295 -> buildInliningIR
-    1:1:int getMaxLocals():123:123 -> c
-    1:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):389:429 -> collectParameterInfo
-    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):428:428 -> collectParameterInfo
-    43:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):400:400 -> collectParameterInfo
-    1:1:boolean computeEquals(java.lang.Object):264:264 -> computeEquals
-    1:1:int computeHashCode():259:259 -> computeHashCode
-    1:1:int getMaxStack():119:119 -> d
-    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():115:115 -> e
-    1:1:int estimatedSizeForInlining():140:140 -> estimatedSizeForInlining
-    1:1:boolean estimatedSizeForInliningAtMost(int):145:145 -> estimatedSizeForInliningAtMost
-    1:1:java.util.List getTryCatchRanges():127:127 -> f
-    1:2:boolean isEmptyVoidMethod():269:270 -> isEmptyVoidMethod
-    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):437:465 -> registerArgumentReferences
-    1:6:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):375:380 -> registerCodeReferences
-    1:1:java.lang.String toString():472:472 -> toString
+    127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):521 -> a
+    128:128:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):521:521 -> a
+    129:153:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):527:551 -> a
+    154:155:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):59:60 -> a
+    154:155:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):551 -> a
+    156:156:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):548:548 -> a
+    1:1:java.util.List getLocalVariables():139:139 -> b
+    2:3:int countNonStackOperations(int):154:155 -> b
+    1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):285:285 -> buildIR
+    1:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):297:299 -> buildInliningIR
+    1:1:int getMaxLocals():127:127 -> c
+    1:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):393:433 -> collectParameterInfo
+    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):432:432 -> collectParameterInfo
+    43:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):404:404 -> collectParameterInfo
+    1:1:boolean computeEquals(java.lang.Object):268:268 -> computeEquals
+    1:1:int computeHashCode():263:263 -> computeHashCode
+    1:1:int getMaxStack():123:123 -> d
+    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():119:119 -> e
+    1:1:int estimatedSizeForInlining():144:144 -> estimatedSizeForInlining
+    1:1:boolean estimatedSizeForInliningAtMost(int):149:149 -> estimatedSizeForInliningAtMost
+    1:1:java.util.List getTryCatchRanges():131:131 -> f
+    1:2:boolean isEmptyVoidMethod():273:274 -> isEmptyVoidMethod
+    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):441:469 -> registerArgumentReferences
+    1:6:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):379:384 -> registerCodeReferences
+    1:1:java.lang.String toString():476:476 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):120:120 -> toString
-    2:2:java.lang.String toString():472 -> toString
-    3:3:java.lang.String toString():472:472 -> toString
-    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):477:477 -> toString
+    2:2:java.lang.String toString():476 -> toString
+    3:3:java.lang.String toString():476:476 -> toString
+    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):481:481 -> toString
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.l$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.cf.code.CfLabel start -> c
     com.android.tools.r8.cf.code.CfLabel end -> d
     int index -> a
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):48:51 -> <init>
-    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> a
-    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):60:62 -> a
-    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():78:78 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> b
-    2:2:int getIndex():66:66 -> b
-    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> c
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():70:70 -> c
-    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> d
-    2:2:com.android.tools.r8.cf.code.CfLabel getStart():74:74 -> d
-    1:1:java.lang.String toString():83:83 -> toString
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):52:55 -> <init>
+    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> a
+    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):64:66 -> a
+    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():82:82 -> a
+    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> b
+    2:2:int getIndex():70:70 -> b
+    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> c
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():74:74 -> c
+    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> d
+    2:2:com.android.tools.r8.cf.code.CfLabel getStart():78:78 -> d
+    1:1:java.lang.String toString():87:87 -> toString
 com.android.tools.r8.graph.ClassAccessFlags -> com.android.tools.r8.graph.m:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():11:11 -> <clinit>
-    1:1:void <init>(int,int):57:57 -> <init>
-    1:1:com.android.tools.r8.graph.ClassAccessFlags copy():77:77 -> A
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> B
-    1:1:int getAsCfAccessFlags():98 -> B
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> C
-    1:1:int getAsDexAccessFlags():89 -> C
-    2:2:boolean isInterface():125:125 -> C
-    2:2:int getAsDexAccessFlags():90 -> C
-    1:1:boolean isAbstract():137:137 -> D
-    1:1:boolean isAnnotation():149:149 -> E
-    1:1:boolean isEnum():161:161 -> F
-    1:1:boolean isInterface():125:125 -> G
-    1:1:boolean isSuper():169:169 -> H
-    1:1:void setAbstract():141:141 -> I
-    1:1:void unsetAbstract():145:145 -> J
-    1:1:void unsetAnnotation():157:157 -> K
-    1:1:void unsetInterface():133:133 -> L
-    1:1:boolean isInterface():125:125 -> a
-    1:1:boolean areValid(int,boolean):106 -> a
-    2:2:boolean isSuper():169:169 -> a
-    2:2:boolean areValid(int,boolean):108 -> a
-    3:7:boolean areValid(int,boolean):114:118 -> a
-    8:8:boolean isEnum():161:161 -> a
-    8:8:boolean areValid(int,boolean):118 -> a
-    9:9:boolean areValid(int,boolean):120:120 -> a
-    1:8:java.util.List getNames():30:37 -> b
-    1:8:java.util.List getPredicates():42:49 -> d
-    1:1:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):72:72 -> e
-    2:2:void <init>(int):53:53 -> e
-    2:2:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):72 -> e
-    1:1:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68:68 -> f
-    2:2:void <init>(int):53:53 -> f
-    2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68 -> f
-    1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):61:63 -> g
+    boolean $assertionsDisabled -> f
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(int,int):61:61 -> <init>
+    1:1:com.android.tools.r8.graph.ClassAccessFlags copy():81:81 -> A
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> B
+    1:1:int getAsCfAccessFlags():91 -> B
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> C
+    1:1:int getAsDexAccessFlags():98 -> C
+    2:2:boolean isInterface():155:155 -> C
+    2:2:int getAsDexAccessFlags():99 -> C
+    1:1:boolean isAbstract():167:167 -> D
+    1:1:boolean isAnnotation():179:179 -> E
+    1:1:boolean isEnum():191:191 -> F
+    1:1:boolean isInterface():155:155 -> G
+    1:1:boolean isSuper():199:199 -> H
+    1:1:void setAbstract():171:171 -> I
+    1:1:void unsetAbstract():175:175 -> J
+    1:1:void unsetAnnotation():187:187 -> K
+    1:1:void unsetInterface():163:163 -> L
+    1:1:boolean isInterface():155:155 -> a
+    1:1:boolean areValid(int,boolean):132 -> a
+    2:2:boolean isSuper():199:199 -> a
+    2:2:boolean areValid(int,boolean):134 -> a
+    3:7:boolean areValid(int,boolean):140:144 -> a
+    8:8:boolean isEnum():191:191 -> a
+    8:8:boolean areValid(int,boolean):144 -> a
+    9:9:boolean areValid(int,boolean):146:146 -> a
+    1:8:java.util.List getNames():34:41 -> b
+    1:8:java.util.List getPredicates():46:53 -> d
+    1:1:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76:76 -> e
+    2:2:void <init>(int):57:57 -> e
+    2:2:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76 -> e
+    1:1:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72:72 -> f
+    2:2:void <init>(int):57:57 -> f
+    2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72 -> f
+    1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):65:67 -> g
 com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.graph.o:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -16059,7 +16072,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):160:160 -> a
+    4:4:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> 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
@@ -16269,158 +16282,167 @@
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> d
     com.android.tools.r8.graph.DexType superType -> e
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> l
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):90:90 -> <init>
-    2:81:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):40:119 -> <init>
-    82:82:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):109:109 -> <init>
-    1:1:java.util.List getNestMembersClassAttributes():961:961 -> A
-    1:1:com.android.tools.r8.graph.DexType getType():720:720 -> B
-    1:1:boolean hasClassInitializer():724:724 -> C
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():742:742 -> D
-    1:1:boolean hasDefaultInitializer():728 -> D
-    1:1:boolean hasKotlinInfo():968:968 -> E
-    1:2:boolean hasStaticSynchronizedMethods():997:998 -> F
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> F
-    3:3:boolean hasStaticSynchronizedMethods():998 -> F
-    1:5:java.util.List instanceFields():454:458 -> G
-    1:4:boolean isAnonymousClass():919:922 -> H
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):96:96 -> <init>
+    2:81:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):46:125 -> <init>
+    82:82:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):115:115 -> <init>
+    1:1:java.util.List getNestMembersClassAttributes():1011:1011 -> A
+    1:1:com.android.tools.r8.graph.DexType getType():770:770 -> B
+    1:1:boolean hasClassInitializer():774:774 -> C
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():792:792 -> D
+    1:1:boolean hasDefaultInitializer():778 -> D
+    1:1:boolean hasKotlinInfo():1018:1018 -> E
+    1:2:boolean hasStaticSynchronizedMethods():1047:1048 -> F
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> F
+    3:3:boolean hasStaticSynchronizedMethods():1048 -> F
+    1:5:java.util.List instanceFields():504:508 -> G
+    1:4:boolean isAnonymousClass():969:972 -> H
     boolean isClasspathClass() -> I
-    1:1:boolean isEnum():646:646 -> J
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():161:161 -> J
-    2:2:boolean isEnum():646 -> J
-    1:1:boolean isInANest():926:926 -> K
-    1:1:boolean isInterface():642:642 -> L
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> L
-    2:2:boolean isInterface():642 -> L
+    1:1:boolean isEnum():696:696 -> J
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():191:191 -> J
+    2:2:boolean isEnum():696 -> J
+    1:1:boolean isInANest():976:976 -> K
+    1:1:boolean isInterface():692:692 -> L
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> L
+    2:2:boolean isInterface():692 -> L
     boolean isLibraryClass() -> M
-    1:3:boolean isLocalClass():906:908 -> N
-    1:3:boolean isMemberClass():912:914 -> O
-    1:1:boolean isNestHost():939:939 -> P
-    1:1:boolean isNestMember():943:943 -> Q
+    1:3:boolean isLocalClass():956:958 -> N
+    1:3:boolean isMemberClass():962:964 -> O
+    1:1:boolean isNestHost():989:989 -> P
+    1:1:boolean isNestMember():993:993 -> Q
     boolean isNotProgramClass() -> R
     boolean isProgramClass() -> S
-    1:1:java.lang.Iterable methods():135:135 -> T
-    1:5:java.util.List staticFields():396:400 -> U
-    1:5:java.util.List virtualMethods():204:208 -> V
-    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> W
-    1:4:boolean verifyNoDuplicateFields():521:524 -> X
-    1:4:boolean verifyNoDuplicateMethods():284:287 -> Y
+    1:1:java.lang.Iterable methods():141:141 -> T
+    1:5:java.util.List staticFields():446:450 -> U
+    1:5:java.util.List virtualMethods():210:214 -> V
+    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():371:373 -> W
+    1:4:boolean verifyNoDuplicateFields():571:574 -> X
+    1:4:boolean verifyNoDuplicateMethods():334:337 -> Y
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> a
     com.android.tools.r8.graph.DexClass asDexClass() -> a
     java.util.Iterator lambda$allImmediateSupertypes$3(java.util.Iterator) -> a
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):129:131 -> a
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):135:137 -> a
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):129 -> a
-    5:11:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):158:164 -> a
-    12:22:void appendDirectMethods(java.util.Collection):168:178 -> a
-    23:26:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):190:193 -> a
-    27:30:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):197:200 -> a
-    31:31:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):308:308 -> a
-    32:54:void virtualizeMethods(java.util.Set):329:351 -> a
-    55:59:void forEachField(java.util.function.Consumer):387:391 -> a
-    60:62:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):492:494 -> a
-    63:65:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):498:500 -> a
-    66:67:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):514:515 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):536:536 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):554 -> a
-    69:69:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> a
-    69:69:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):555 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):560:560 -> a
-    71:72:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):617:618 -> a
-    73:75:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):732:734 -> a
-    76:83:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):791:798 -> a
-    84:92:boolean hasClassInitializerThatCannotBePostponed():812:820 -> a
-    84:92:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):802 -> a
-    93:96:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):805:808 -> a
-    97:97:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):855:855 -> a
-    98:106:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):894:902 -> a
-    107:108:void setNestHost(com.android.tools.r8.graph.DexType):934:935 -> a
-    109:109:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):976:976 -> a
-    110:110:boolean hasInstanceFields():972:972 -> a
-    110:110:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):979 -> a
-    111:111:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):982:982 -> a
-    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    112:112:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):982 -> a
-    113:113:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):983:983 -> a
-    114:114:boolean isValid(com.android.tools.r8.utils.InternalOptions):987:987 -> a
-    115:115:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):272:272 -> a
-    115:115:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    116:116:boolean isAbstract():626:626 -> a
-    116:116:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):273 -> a
-    116:116:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    117:118:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):274:275 -> a
-    117:118:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    119:119:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> a
-    119:119:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275 -> a
-    119:119:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    120:121:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275:276 -> a
-    120:121:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    122:126:boolean isValid(com.android.tools.r8.utils.InternalOptions):988:992 -> a
-    1:5:void removeDirectMethod(int):182:186 -> b
-    6:11:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):212:217 -> b
-    12:21:void appendVirtualMethods(java.util.Collection):221:230 -> b
-    22:24:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):242:244 -> b
-    25:27:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):248:250 -> b
-    28:29:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):264:265 -> b
-    30:34:void forEachMethod(java.util.function.Consumer):293:297 -> b
-    35:35:int lambda$directMethodsSorted$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):316:316 -> b
-    36:38:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):433:435 -> b
-    39:41:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):439:441 -> b
-    42:46:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):504:508 -> b
-    47:47:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):536:536 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):560:560 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):580 -> b
-    49:49:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):570:570 -> b
-    49:49:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):581 -> b
-    50:50:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):565:565 -> b
-    51:51:boolean isFinal():634:634 -> b
-    51:51:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):638 -> b
-    52:57:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):838:843 -> b
-    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):254:258 -> c
-    6:6:int lambda$virtualMethodsSorted$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):324:324 -> c
-    7:7:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> c
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):570:570 -> c
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):575:575 -> c
-    10:16:boolean isResolvable(com.android.tools.r8.graph.AppView):758:764 -> c
-    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
-    17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276 -> c
-    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
-    18:18:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):277:277 -> c
-    18:18:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
-    19:19:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276 -> c
-    19:19:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
-    20:23:boolean isResolvable(com.android.tools.r8.graph.AppView):771:774 -> c
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):146:146 -> collectMixedSectionItems
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):135 -> a
+    5:11:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):164:170 -> a
+    12:22:void appendDirectMethods(java.util.Collection):174:184 -> a
+    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: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: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
+    76:98:void virtualizeMethods(java.util.Set):379:401 -> a
+    99:103:void forEachField(java.util.function.Consumer):437:441 -> a
+    104:106:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):542:544 -> a
+    107:109:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):548:550 -> a
+    110:111:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):564:565 -> a
+    112:112:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):586:586 -> a
+    112:112:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):604 -> a
+    113:113:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):581:581 -> a
+    113:113:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):605 -> a
+    114:114:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):610:610 -> a
+    115:116:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):667:668 -> a
+    117:119:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):782:784 -> a
+    120:127:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):841:848 -> a
+    128:136:boolean hasClassInitializerThatCannotBePostponed():862:870 -> a
+    128:136:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):852 -> a
+    137:140:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):855:858 -> a
+    141:141:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):905:905 -> a
+    142:150:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):944:952 -> a
+    151:152:void setNestHost(com.android.tools.r8.graph.DexType):984:985 -> a
+    153:153:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1026:1026 -> a
+    154:154:boolean hasInstanceFields():1022:1022 -> a
+    154:154:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1029 -> a
+    155:155:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1032:1032 -> a
+    156:156:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    156:156:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1032 -> a
+    157:157:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1033:1033 -> a
+    158:158:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037:1037 -> a
+    159:159:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):322:322 -> a
+    159:159:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    160:160:boolean isAbstract():676:676 -> a
+    160:160:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):323 -> a
+    160:160:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    161:162:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):324:325 -> a
+    161:162:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    163:163:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
+    163:163:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):325 -> a
+    163:163:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    164:165:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):325:326 -> a
+    164:165:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    166:170:boolean isValid(com.android.tools.r8.utils.InternalOptions):1038:1042 -> a
+    1:5:void removeDirectMethod(int):188:192 -> b
+    6:14:java.util.Map kotlinExtensions(java.util.List,com.android.tools.r8.graph.AppView):234:242 -> b
+    15:20:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):262:267 -> b
+    21:30:void appendVirtualMethods(java.util.Collection):271:280 -> b
+    31:33:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):292:294 -> b
+    34:36:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):298:300 -> b
+    37:38:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):314:315 -> b
+    39:43:void forEachMethod(java.util.function.Consumer):343:347 -> b
+    44:44:int lambda$directMethodsSorted$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):366:366 -> b
+    45:47:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):483:485 -> b
+    48:50:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):489:491 -> b
+    51:55:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):554:558 -> b
+    56:56:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):586:586 -> b
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):610:610 -> b
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):630 -> b
+    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):620:620 -> b
+    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):631 -> b
+    59:59:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):615:615 -> b
+    60:60:boolean isFinal():684:684 -> b
+    60:60:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):688 -> b
+    61:66:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):888:893 -> b
+    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):304:308 -> c
+    6:6:int lambda$virtualMethodsSorted$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):374:374 -> c
+    7:7:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):581:581 -> c
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):620:620 -> c
+    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 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 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 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
     boolean isDexClass() -> d
-    1:3:java.lang.Iterable methods(java.util.function.Predicate):139:141 -> d
+    1:3:java.lang.Iterable methods(java.util.function.Predicate):145:147 -> d
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> d
-    4:4:java.lang.Iterable methods(java.util.function.Predicate):139 -> d
-    5:5:boolean isSerializable(com.android.tools.r8.graph.AppView):778:778 -> d
-    1:2:void removeEnclosingMethod(java.util.function.Predicate):871:872 -> e
-    1:1:void removeInnerClasses(java.util.function.Predicate):881:881 -> f
+    4:4:java.lang.Iterable methods(java.util.function.Predicate):145 -> d
+    5:5:boolean isSerializable(com.android.tools.r8.graph.AppView):828:828 -> d
+    1:2:void removeEnclosingMethod(java.util.function.Predicate):921:922 -> e
+    1:1:void removeInnerClasses(java.util.function.Predicate):931:931 -> f
     boolean isStaticMember() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():720:720 -> h
-    1:1:com.android.tools.r8.graph.DexReference toReference():653 -> h
-    1:3:java.lang.Iterable allImmediateSupertypes():825:827 -> i
-    4:7:java.lang.Iterable allImmediateSupertypes():826:829 -> i
-    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():302:307 -> j
+    1:1:com.android.tools.r8.graph.DexType getType():770:770 -> h
+    1:1:com.android.tools.r8.graph.DexReference toReference():703 -> h
+    1:3:java.lang.Iterable allImmediateSupertypes():875:877 -> i
+    4:7:java.lang.Iterable allImmediateSupertypes():876:879 -> i
+    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():352:357 -> j
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> k
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> l
-    1:1:void clearEnclosingMethod():867:867 -> m
-    1:1:void clearInnerClasses():877:877 -> n
-    1:1:void clearNestHost():930:930 -> o
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():854:855 -> p
-    1:5:java.util.List directMethods():150:154 -> q
-    1:3:com.android.tools.r8.graph.DexEncodedMethod[] directMethodsSorted():313:315 -> r
-    1:1:java.lang.Iterable fields():125:125 -> s
-    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():703:712 -> t
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():863:863 -> u
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():885:886 -> v
-    1:1:java.util.List getInnerClasses():859:859 -> w
+    1:1:void clearEnclosingMethod():917:917 -> m
+    1:1:void clearInnerClasses():927:927 -> n
+    1:1:void clearNestHost():980:980 -> o
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():904:905 -> p
+    1:5:java.util.List directMethods():156:160 -> q
+    1:3:com.android.tools.r8.graph.DexEncodedMethod[] directMethodsSorted():363:365 -> r
+    1:1:java.lang.Iterable fields():131:131 -> s
+    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():753:762 -> t
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():913:913 -> u
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():935:936 -> v
+    1:1:java.util.List getInnerClasses():909:909 -> w
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> x
-    1:5:com.android.tools.r8.graph.DexType getNestHost():947:951 -> y
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():957:957 -> z
+    1:5:com.android.tools.r8.graph.DexType getNestHost():997:1001 -> y
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1007:1007 -> z
 com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.C$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.graph.C$b:
@@ -16858,7 +16880,7 @@
     5:5:boolean isStatic():124:124 -> a
     5:5:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):200 -> a
     6:6:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):203:203 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> 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 mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):203 -> a
     8:17:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):207:216 -> a
     18:18:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):215:215 -> a
@@ -16874,7 +16896,7 @@
     42:42:boolean isStatic():124:124 -> a
     42:42:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):183 -> a
     43:43:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):184:184 -> a
-    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     44:44:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):184 -> a
     45:49:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):185:189 -> a
     50:50:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):183:183 -> a
@@ -16925,250 +16947,239 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> n
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:46:void <clinit>():78:123 -> <clinit>
-    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):198:198 -> <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):133:205 -> <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):215:216 -> <init>
-    1:2:boolean isDirectMethod():327:328 -> A
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> A
-    3:3:boolean isDirectMethod():328 -> A
-    4:4:boolean isDirectMethod():328:328 -> A
-    1:1:boolean isFinal():257:257 -> B
-    1:2:boolean isInitializer():261:262 -> C
-    1:2:boolean isInstanceInitializer():266:267 -> D
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> D
-    3:3:boolean isInstanceInitializer():267 -> D
-    4:4:boolean isInstanceInitializer():267:267 -> D
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():220:220 -> E
-    1:2:boolean isNonAbstractNonNativeMethod():304:305 -> F
-    1:2:boolean isNonAbstractVirtualMethod():299:300 -> G
-    1:1:boolean isObsolete():157:157 -> H
-    1:1:boolean isOnlyInlinedIntoNestMembers():352:352 -> I
-    1:2:boolean isPrivateMethod():319:320 -> J
-    1:2:boolean isProcessed():248:249 -> K
-    1:2:boolean isPublicMethod():314:315 -> L
-    1:2:boolean isPublicized():309:310 -> M
-    1:2:boolean isStatic():333:334 -> N
-    1:2:boolean isSyntheticMethod():347:348 -> O
-    1:2:boolean isVirtualMethod():290:291 -> P
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> P
-    3:3:boolean isVirtualMethod():291 -> P
-    1:2:void markNotProcessed():456:457 -> Q
-    1:2:java.lang.String qualifiedName():582:583 -> R
-    1:2:void removeCode():559:560 -> S
-    1:1:void setObsolete():163:163 -> T
-    1:1:boolean shouldNotHaveCode():546:546 -> U
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630:636 -> V
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> V
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():636 -> V
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():637:637 -> V
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():701:707 -> W
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():677:686 -> X
-    1:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1036:1044 -> Y
-    10:10:void setObsolete():163:163 -> Y
-    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1045 -> Y
-    1:1:void unsetObsolete():190:190 -> 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):78:78 -> 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):78:78 -> a
-    3:5:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):224:226 -> a
+    1:46:void <clinit>():82:127 -> <clinit>
+    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
+    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
+    1:1:boolean isFinal():261:261 -> B
+    1:2:boolean isInitializer():265:266 -> C
+    1:2:boolean isInstanceInitializer():270:271 -> D
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> D
+    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: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
     6:6:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
-    6:6:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):226 -> a
-    7:8:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):226:227 -> a
-    9:14:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):226:231 -> a
+    6:6:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):230 -> a
+    7:8:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):230:231 -> a
+    9:14:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):230:235 -> a
     15:15:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
-    15:15:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):232 -> a
-    16:21:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):231:236 -> a
-    22:24:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):240:242 -> a
-    25:26: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):360:361 -> a
-    27:82: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):370:425 -> a
-    83:83: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):421:421 -> a
-    84:84: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):417:417 -> a
-    85: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):410:413 -> 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):403:406 -> 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):396:399 -> 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):389:392 -> a
-    101:120:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):430:449 -> a
-    121:121:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):446:446 -> a
-    122:122:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):443:443 -> a
-    123:123:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):440:440 -> a
-    124:124:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):437:437 -> a
-    125:143:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):434:452 -> a
-    144:145:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):461:462 -> a
-    146:147: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):471:472 -> a
-    148:151:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):477:480 -> a
-    152:152:boolean hasParameterInfo():505:505 -> a
-    152:152:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480 -> a
-    153:154:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480:481 -> a
-    155:156:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):500:501 -> a
-    155:156:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):481 -> a
-    157:157:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):483:483 -> a
-    158:160:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):487:489 -> a
-    161:164:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):493:496 -> a
-    165:166:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1127:1128 -> a
-    165:166:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496 -> a
-    167:167:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496:496 -> a
-    168:173:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):537:542 -> a
-    174:182:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):592:600 -> a
-    183:195:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604:616 -> a
-    196:253:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:389 -> a
-    196:253:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
-    254:257:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617:620 -> a
-    258:267:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):647:656 -> a
-    268:269:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):711:712 -> a
-    270:274:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):731:735 -> a
-    270:274:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    275:282:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):734:741 -> a
-    275:282:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    283:289:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):740:746 -> a
-    283:289:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    290:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):744:759 -> a
-    290:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    306:306:void setObsolete():163:163 -> a
-    306:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):760 -> a
-    306:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    307:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):761:761 -> a
-    307:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    308:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714:714 -> a
-    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):765:769 -> a
-    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    314:322:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:776 -> a
-    314:322:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    323:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:781 -> a
-    323:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    332:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:786 -> a
-    332:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    341:345:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784:788 -> a
-    341:345:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    346:347:boolean isStaticMember():339:340 -> a
-    346:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):789 -> a
-    346:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    348:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):793:815 -> a
-    348:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    371:371:void setObsolete():163:163 -> a
-    371:371:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):816 -> a
-    371:371:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    372:372:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):817:817 -> a
-    372:372:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    373:377:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):719:723 -> a
-    378:382:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):722:726 -> a
-    383:383:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    383:383:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726 -> a
-    384:384:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726:726 -> a
-    385:386:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):821:822 -> a
-    387:401:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):826:840 -> a
-    402:420:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:874 -> a
-    421:421:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    421:421:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):874 -> a
-    422:422:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875:875 -> a
-    423:423:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    423:423:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875 -> a
-    424:424:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876:876 -> a
-    425:425:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
-    425:425:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876 -> a
-    426:426:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):877:877 -> a
-    427:432: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):882:887 -> a
-    433:456: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):884:907 -> a
-    457:457: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):892:892 -> a
-    458:461:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:898 -> a
-    462:462:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
-    462:462:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
-    462:462:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
-    463:463:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
-    463:463:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
-    464:466:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):900:902 -> a
-    467:467:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
-    467:467:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902 -> a
-    468:469:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902:903 -> a
-    470:472:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):911:913 -> a
-    473:480: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):924:931 -> a
-    481:486:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):966:971 -> a
-    487:487:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
-    487:487:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
-    487:487:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):971 -> a
-    488:495:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):973:980 -> a
-    496:496:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
-    496:496:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):980 -> a
-    497:497:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):983:983 -> a
-    498:498:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    498:498:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):983 -> a
-    499:516:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985:1002 -> a
-    517:517:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
-    517:517:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1002 -> a
-    518:518:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004:1004 -> a
-    519:519:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    519:519:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004 -> a
-    520:520:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1007:1007 -> a
-    521:526: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):1012:1017 -> a
-    527:527:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    527:527: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):1019 -> a
-    528:534: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):1021:1027 -> a
-    535:546:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1052:1063 -> a
-    547:557:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1062:1072 -> a
-    558:561:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1113:1116 -> a
-    562:562:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    562:562:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1116 -> a
-    563:563:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1118:1118 -> a
-    564:565:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1140:1141 -> a
-    566:567:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1151:1152 -> a
-    568:568:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1156:1156 -> a
-    569:570:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1127:1128 -> a
-    569:570:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1158 -> a
-    571:575:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1158:1162 -> a
-    1:1:void checkIfObsolete():151:151 -> a0
-    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):171:175 -> b
-    6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> b
-    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):175 -> b
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):176:177 -> b
-    9:12:void upgradeClassFileVersion(int):575:578 -> b
-    13:34:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):935:956 -> b
-    35:35:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> b
-    35:35:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):956 -> b
-    36:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):957:958 -> b
-    38:38:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> b
-    38:38:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):958 -> b
-    39:42:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959:962 -> b
-    43:46:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):996:999 -> b
-    1:1:com.android.tools.r8.graph.Code access$200(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> c
-    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):871:871 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1103:1103 -> c
-    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521:527 -> collectIndexedItems
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):532:532 -> collectMixedSectionItems
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$300(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> d
-    2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):950:953 -> d
-    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$400(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> e
-    1:1:int access$500(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> f
-    2:2:boolean isDexEncodedMethod():1097:1097 -> f
-    1:2:boolean isStaticMember():339:340 -> g
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1167:1167 -> g
-    1:2:com.android.tools.r8.graph.DexReference toReference():1091:1092 -> h
-    1:1:com.android.tools.r8.graph.DexMethod getKey():1086:1086 -> i
-    2:2:com.android.tools.r8.graph.DexMethod getKey():1086:1086 -> i
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():78 -> i
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:697 -> j
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():666:667 -> k
-    1:2:java.lang.String codeToString():1078:1079 -> l
-    1:2:java.lang.String descriptor():587:588 -> m
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1145:1146 -> n
-    1:3:int getClassFileVersion():564:566 -> o
-    1:2:com.android.tools.r8.graph.Code getCode():554:555 -> p
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():167:167 -> q
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1132:1136 -> r
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1127:1128 -> s
-    1:1:java.util.Map getParameterInfo():509:509 -> t
-    1:2:java.lang.String toSourceString():625:626 -> toSourceString
-    1:2:java.lang.String toString():514:515 -> toString
-    1:2:boolean hasAnnotation():1108:1109 -> u
-    1:2:boolean hasClassFileVersion():570:571 -> v
-    1:1:boolean hasCode():550:550 -> w
-    1:1:boolean hasParameterInfo():505:505 -> x
-    1:2:boolean isClassInitializer():276:277 -> y
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> y
-    3:3:boolean isClassInitializer():277 -> y
-    4:4:boolean isClassInitializer():277:277 -> y
-    1:1:boolean isDefaultMethod():282:282 -> z
-    2:2:boolean isAbstract():253:253 -> z
-    2:2:boolean isDefaultMethod():282 -> z
-    3:3:boolean isDefaultMethod():282:282 -> z
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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: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: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: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
+    4:4:boolean isClassInitializer():281:281 -> y
+    1:1:boolean isDefaultMethod():286:286 -> z
+    2:2:boolean isAbstract():257:257 -> z
+    2:2:boolean isDefaultMethod():286 -> z
+    3:3:boolean isDefaultMethod():286:286 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.T$a:
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.T$b:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
@@ -17180,26 +17191,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>():1170:1170 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1170:1170 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1181:1197 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1193:1193 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1170:1170 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1202:1202 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1211:1230 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1206:1206 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1230 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1233:1235 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1206:1206 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1233 -> a
-    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1255:1257 -> a
-    31:31:void setCode(com.android.tools.r8.graph.Code):1263:1263 -> a
-    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1267:1272 -> b
-    7:13:com.android.tools.r8.graph.DexEncodedMethod build():1271:1277 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1240:1240 -> c
-    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1240 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1245:1249 -> d
+    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
+    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
 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
@@ -17209,9 +17220,9 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> h
-    1:24:void <clinit>():92:115 -> <clinit>
-    25:25:void <clinit>():88:88 -> <clinit>
-    1:1:void <init>(java.lang.String,int):88:88 -> <init>
+    1:24:void <clinit>():96:119 -> <clinit>
+    25:25:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(java.lang.String,int):92:92 -> <init>
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.U:
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -17223,17 +17234,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):160:160 -> a
+    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> 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):160:160 -> a
+    19:19:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> 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):160:160 -> a
+    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> 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
@@ -17266,392 +17277,393 @@
     1:1:java.lang.String toSmaliString():60:60 -> toSmaliString
     1:1:java.lang.String toSourceString():64:64 -> toSourceString
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.W:
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
-    com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString mathDescriptor -> b1
-    com.android.tools.r8.graph.DexType methodType -> F2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> w3
-    com.android.tools.r8.graph.DexType throwableType -> g3
+    com.android.tools.r8.graph.DexString getFieldName -> A0
+    com.android.tools.r8.graph.DexString unboxIntMethodName -> Q
+    com.android.tools.r8.graph.DexString iterableDescriptor -> b1
+    com.android.tools.r8.graph.DexType fieldType -> F2
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> g3
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> G3
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> k4
-    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> I0
-    com.android.tools.r8.graph.DexString proxyDescriptor -> j1
-    com.android.tools.r8.graph.DexString nameMethodName -> r0
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> I0
+    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> j1
+    com.android.tools.r8.graph.DexString ordinalMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexString enumValuesFieldName -> R1
+    com.android.tools.r8.graph.DexString thisName -> R1
+    com.android.tools.r8.graph.DexType nullValueType -> x4
     java.util.Map fields -> c
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> W3
-    com.android.tools.r8.graph.DexType booleanType -> V1
-    com.android.tools.r8.graph.DexType objectsType -> w2
-    com.android.tools.r8.graph.DexString getFieldName -> z0
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> O3
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> o2
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> y3
-    com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    com.android.tools.r8.graph.DexType comparableType -> h4
-    com.android.tools.r8.graph.DexType boxedCharType -> g2
-    com.android.tools.r8.graph.DexString npeDescriptor -> I1
-    com.android.tools.r8.graph.DexString valueOfMethodName -> i0
-    com.android.tools.r8.graph.DexString thisName -> Q1
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
-    com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> W3
+    com.android.tools.r8.graph.DexType annotationType -> w2
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> s3
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> K3
+    java.util.Map libraryMethodsWithoutSideEffects -> s4
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> z0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> D3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> O3
+    com.android.tools.r8.graph.DexType charSequenceType -> o2
+    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> a0
+    com.android.tools.r8.graph.DexString unboxLongMethodName -> R
+    com.android.tools.r8.graph.DexType externalizableType -> h4
+    com.android.tools.r8.graph.DexType boxedByteType -> g2
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> J3
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> I1
+    com.android.tools.r8.graph.DexString trimName -> i0
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> Q1
+    com.android.tools.r8.graph.DexString classDescriptor -> Q0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> j4
     java.util.Map protos -> d
-    com.android.tools.r8.graph.DexType callableType -> W2
+    com.android.tools.r8.graph.DexType comparatorType -> W2
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexString objectsDescriptor -> Y0
-    com.android.tools.r8.graph.DexString optionalLongDescriptor -> z1
-    com.android.tools.r8.graph.DexType serviceLoaderType -> O2
-    com.android.tools.r8.graph.DexString streamDescriptor -> A1
-    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
+    com.android.tools.r8.graph.DexString annotationDescriptor -> Y0
+    com.android.tools.r8.graph.DexString optionalIntDescriptor -> z1
+    com.android.tools.r8.graph.DexType proxyType -> O2
+    com.android.tools.r8.graph.DexString optionalLongDescriptor -> A1
+    com.android.tools.r8.graph.DexString unboxFloatMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> f3
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> i1
-    com.android.tools.r8.graph.DexType fieldType -> E2
-    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
-    com.android.tools.r8.graph.DexString classDescriptor -> P0
-    com.android.tools.r8.graph.DexString collectionDescriptor -> q1
-    com.android.tools.r8.graph.DexString ordinalMethodName -> q0
-    com.android.tools.r8.graph.DexType annotationType -> v2
-    com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexType nullValueType -> w4
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> J3
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> V3
+    com.android.tools.r8.graph.DexType streamType -> f3
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> i1
+    com.android.tools.r8.graph.DexType classLoaderType -> E2
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> H0
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> P0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> q1
+    com.android.tools.r8.graph.DexString finalizeMethodName -> q0
+    com.android.tools.r8.graph.DexType charArrayType -> U1
+    com.android.tools.r8.graph.DexType enumType -> v2
+    com.android.tools.r8.graph.DexString descriptorSeparator -> C
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> V3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> g
-    java.util.Map libraryMethodsWithoutSideEffects -> r4
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> C3
-    com.android.tools.r8.graph.DexType charSequenceType -> n2
+    com.android.tools.r8.graph.DexString getTypeNameName -> y0
+    com.android.tools.r8.graph.DexType boxedNumberType -> n2
     java.util.Map methods -> e
-    com.android.tools.r8.graph.DexType annotationInnerClass -> N3
-    com.android.tools.r8.graph.DexString iterableDescriptor -> a1
-    com.android.tools.r8.graph.DexType boxedByteType -> f2
-    com.android.tools.r8.graph.DexString isEmptyMethodName -> T
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> z3
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> N3
+    com.android.tools.r8.graph.DexString collectionsDescriptor -> a1
+    com.android.tools.r8.graph.DexType boxedBooleanType -> f2
+    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> I3
-    com.android.tools.r8.graph.DexType externalizableType -> g4
-    com.android.tools.r8.graph.DexString trimName -> h0
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> H1
-    com.android.tools.r8.graph.DexString finalizeMethodName -> p0
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> P1
-    com.android.tools.r8.graph.DexType comparatorType -> V2
-    com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> x3
+    com.android.tools.r8.graph.DexType serializableType -> g4
+    com.android.tools.r8.graph.DexString substringName -> h0
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> H1
+    java.util.Set libraryClassesWithoutStaticInitialization -> v4
+    com.android.tools.r8.graph.DexString getClassMethodName -> p0
+    com.android.tools.r8.graph.DexString constructorMethodName -> P1
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> B3
+    com.android.tools.r8.graph.DexType collectionType -> V2
+    com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> D
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> k4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> h
-    com.android.tools.r8.graph.DexString annotationDescriptor -> X0
-    com.android.tools.r8.graph.DexString optionalIntDescriptor -> y1
-    com.android.tools.r8.graph.DexType proxyType -> N2
+    com.android.tools.r8.graph.DexString enumDescriptor -> X0
+    com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> y1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> N2
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> o3
     java.util.Map methodHandles -> f
-    com.android.tools.r8.graph.DexString getDeclaredMethodName -> C0
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
-    com.android.tools.r8.graph.DexType streamType -> e3
+    com.android.tools.r8.graph.DexString getMethodName -> C0
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> d1
+    com.android.tools.r8.graph.DexType optionalLongType -> e3
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType classLoaderType -> D2
-    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
-    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
+    com.android.tools.r8.graph.DexType classType -> D2
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> m4
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> K0
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString forNameMethodName -> t0
-    java.util.Set libraryMethodsReturningNonNull -> q4
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> U3
-    com.android.tools.r8.graph.DexType charArrayType -> T1
-    com.android.tools.r8.graph.DexType enumType -> u2
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> M3
-    com.android.tools.r8.graph.DexString unboxByteMethodName -> M
-    com.android.tools.r8.graph.DexType boxedNumberType -> m2
-    com.android.tools.r8.graph.DexString throwableDescriptor -> C1
-    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType serializableType -> f4
-    com.android.tools.r8.graph.DexType boxedBooleanType -> e2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> s3
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> K1
-    com.android.tools.r8.graph.DexString internMethodName -> k0
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> A3
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> t1
-    com.android.tools.r8.graph.DexType collectionType -> U2
-    boolean skipNameValidationForTesting -> v4
-    com.android.tools.r8.graph.DexType invocationHandlerType -> M2
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> n3
-    com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> c1
-    com.android.tools.r8.graph.DexString getMethodName -> B0
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> F3
-    com.android.tools.r8.graph.DexType classType -> C2
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> l4
-    com.android.tools.r8.graph.DexType optionalLongType -> d3
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> H3
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> t0
+    java.util.Set libraryMethodsReturningReceiver -> q4
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> T1
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> I3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> U3
+    com.android.tools.r8.graph.DexType classArrayType -> u2
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> u3
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> M3
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> n4
+    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> M
+    com.android.tools.r8.graph.DexType boxedShortType -> m2
+    com.android.tools.r8.graph.DexString arraysDescriptor -> C1
+    com.android.tools.r8.graph.DexString indexOfMethodName -> c0
+    com.android.tools.r8.graph.DexType enumerationType -> f4
+    com.android.tools.r8.graph.DexType voidType -> e2
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> K1
+    com.android.tools.r8.graph.DexString toStringMethodName -> k0
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> S0
+    com.android.tools.r8.graph.DexString callableDescriptor -> t1
+    com.android.tools.r8.graph.DexType mapEntryType -> U2
+    com.android.tools.r8.graph.DexType methodTypeType -> M2
+    com.android.tools.r8.graph.DexType npeType -> n3
+    com.android.tools.r8.graph.DexString unboxByteMethodName -> N
+    com.android.tools.r8.graph.DexString mathDescriptor -> c1
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> B0
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> x3
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> C2
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> l4
+    com.android.tools.r8.graph.DexType optionalIntType -> d3
+    com.android.tools.r8.graph.DexString proxyDescriptor -> k1
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> J0
     java.util.Map strings -> a
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> S1
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
-    java.util.Set libraryMethodsReturningReceiver -> p4
-    com.android.tools.r8.graph.DexType classArrayType -> t2
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> r3
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> T3
-    com.android.tools.r8.graph.DexType boxedShortType -> l2
-    com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> L3
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> m4
-    com.android.tools.r8.graph.DexString unboxIntMethodName -> P
-    com.android.tools.r8.graph.DexString indexOfMethodName -> b0
-    com.android.tools.r8.graph.DexString arraysDescriptor -> B1
-    com.android.tools.r8.graph.DexType voidType -> d2
-    com.android.tools.r8.graph.DexType enumerationType -> e4
-    com.android.tools.r8.graph.DexString toStringMethodName -> j0
-    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> J1
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
-    com.android.tools.r8.graph.DexString callableDescriptor -> s1
+    com.android.tools.r8.graph.DexString enumValuesFieldName -> S1
+    com.android.tools.r8.graph.DexString nameMethodName -> s0
+    com.android.tools.r8.graph.DexType objectArrayType -> t2
+    com.android.tools.r8.graph.DexType annotationThrows -> T3
+    com.android.tools.r8.graph.DexType boxedLongType -> l2
+    com.android.tools.r8.graph.DexString unboxCharMethodName -> O
+    com.android.tools.r8.graph.DexType annotationDefault -> L3
+    com.android.tools.r8.graph.DexString unboxShortMethodName -> P
+    com.android.tools.r8.graph.DexString contentEqualsMethodName -> b0
+    com.android.tools.r8.graph.DexString streamDescriptor -> B1
+    com.android.tools.r8.graph.DexType shortType -> d2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> t3
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> j4
+    com.android.tools.r8.graph.DexType listIteratorType -> e4
+    com.android.tools.r8.graph.DexString valueOfMethodName -> j0
+    com.android.tools.r8.graph.DexString npeDescriptor -> J1
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> R0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> s1
     java.util.Map types -> b
-    com.android.tools.r8.graph.DexType mapEntryType -> T2
-    com.android.tools.r8.graph.DexString collectionsDescriptor -> Z0
-    com.android.tools.r8.graph.DexType methodTypeType -> L2
-    com.android.tools.r8.graph.DexType npeType -> m3
-    com.android.tools.r8.graph.DexString assertionsDisabled -> E0
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> B2
-    com.android.tools.r8.graph.DexType optionalIntType -> c3
-    com.android.tools.r8.graph.DexString equalsMethodName -> Y
+    com.android.tools.r8.graph.DexType mapType -> T2
+    boolean skipNameValidationForTesting -> w4
+    com.android.tools.r8.graph.DexString objectsDescriptor -> Z0
+    com.android.tools.r8.graph.DexType methodHandleType -> L2
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> m3
+    com.android.tools.r8.graph.DexString newInstanceName -> E0
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> f1
+    com.android.tools.r8.graph.DexType strictMathType -> B2
+    com.android.tools.r8.graph.DexType optionalDoubleType -> c3
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> w3
+    com.android.tools.r8.graph.DexString endsWithMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> o4
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> M0
-    com.android.tools.r8.graph.DexString setDescriptor -> n1
-    com.android.tools.r8.graph.DexType floatType -> Z1
-    com.android.tools.r8.graph.DexString unknownTypeName -> x4
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
-    com.android.tools.r8.graph.DexType annotationThrows -> S3
-    com.android.tools.r8.graph.DexType objectArrayType -> s2
-    com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType annotationDefault -> K3
-    com.android.tools.r8.graph.DexType boxedLongType -> k2
-    java.util.IdentityHashMap internalSentinels -> y4
-    com.android.tools.r8.graph.DexString icceDescriptor -> E1
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> C3
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> o4
+    com.android.tools.r8.graph.DexString stringDescriptor -> M0
+    com.android.tools.r8.graph.DexString listDescriptor -> n1
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> v3
+    com.android.tools.r8.graph.DexType doubleType -> Z1
+    com.android.tools.r8.graph.DexString getNameName -> v0
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> V1
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> S3
+    com.android.tools.r8.graph.DexType objectType -> s2
+    com.android.tools.r8.kotlin.Kotlin kotlin -> E3
+    com.android.tools.r8.graph.DexString boxedIntDescriptor -> I
+    com.android.tools.r8.graph.DexType boxedIntType -> k2
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
-    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> i4
-    com.android.tools.r8.graph.DexType listIteratorType -> d4
-    com.android.tools.r8.graph.DexType shortType -> c2
-    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> M1
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> s4
-    com.android.tools.r8.graph.DexString wrapperFieldName -> m0
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> o3
-    com.android.tools.r8.graph.DexString fieldDescriptor -> U0
-    com.android.tools.r8.graph.DexString runnableDescriptor -> v1
-    com.android.tools.r8.graph.DexType mapType -> S2
-    com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexType methodHandleType -> K2
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> l3
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> j3
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
-    com.android.tools.r8.graph.DexType stringBufferType -> I2
-    com.android.tools.r8.graph.DexString newInstanceName -> D0
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> v3
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> n4
-    com.android.tools.r8.graph.DexType optionalDoubleType -> b3
-    com.android.tools.r8.graph.DexString stringDescriptor -> L0
-    com.android.tools.r8.graph.DexString listDescriptor -> m1
-    com.android.tools.r8.graph.DexType strictMathType -> A2
-    com.android.tools.r8.graph.DexType doubleType -> Y1
-    com.android.tools.r8.graph.DexType mathType -> z2
-    com.android.tools.r8.graph.DexType metafactoryType -> Z3
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> U1
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> t3
-    com.android.tools.r8.graph.DexString getNameName -> u0
-    com.android.tools.r8.graph.DexType objectType -> r2
-    com.android.tools.r8.kotlin.Kotlin kotlin -> D3
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> R3
-    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    com.android.tools.r8.graph.DexType boxedIntType -> j2
-    com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> D1
+    com.android.tools.r8.graph.DexString compareToMethodName -> e0
+    com.android.tools.r8.graph.DexType iteratorType -> d4
+    com.android.tools.r8.graph.DexType longType -> c2
+    com.android.tools.r8.graph.DexString equalsMethodName -> Z
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> M1
+    com.android.tools.r8.graph.DexString convertMethodName -> m0
+    com.android.tools.r8.graph.DexString constructorDescriptor -> U0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> v1
+    com.android.tools.r8.graph.DexType setType -> S2
+    com.android.tools.r8.graph.DexString boxedLongDescriptor -> J
+    com.android.tools.r8.graph.DexType varHandleType -> K2
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> l3
+    com.android.tools.r8.graph.DexType icceType -> j3
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> e1
+    com.android.tools.r8.graph.DexType stringBuilderType -> I2
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> D0
+    com.android.tools.r8.graph.DexType optionalType -> b3
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> L0
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> m1
+    com.android.tools.r8.graph.DexType mathType -> A2
+    com.android.tools.r8.graph.DexType charType -> Y1
+    com.android.tools.r8.graph.DexType iterableType -> z2
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> Z3
+    com.android.tools.r8.graph.DexString forNameMethodName -> u0
+    com.android.tools.r8.graph.DexType stringArrayType -> r2
+    com.android.tools.r8.graph.DexType annotationSignature -> R3
+    com.android.tools.r8.graph.DexString boxedShortDescriptor -> K
+    com.android.tools.r8.graph.DexType boxedFloatType -> j2
+    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> d0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> D1
     java.util.Map setFiles -> n
-    com.android.tools.r8.graph.DexType longType -> b2
-    com.android.tools.r8.graph.DexType iteratorType -> c4
-    com.android.tools.r8.graph.DexString convertMethodName -> l0
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> L1
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> p3
-    com.android.tools.r8.graph.DexType runnableType -> Z2
-    com.android.tools.r8.graph.DexString constructorDescriptor -> T0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> u1
-    com.android.tools.r8.graph.DexType setType -> R2
-    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType varHandleType -> J2
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> k3
-    com.android.tools.r8.graph.DexType icceType -> i3
-    com.android.tools.r8.graph.DexType stringBuilderType -> H2
-    com.android.tools.r8.graph.DexString lengthMethodName -> U
+    com.android.tools.r8.graph.DexType intType -> b2
+    com.android.tools.r8.graph.DexType lookupType -> c4
+    com.android.tools.r8.graph.DexString internMethodName -> l0
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> L1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> p3
+    java.util.Set libraryMethodsReturningNonNull -> r4
+    com.android.tools.r8.graph.DexType consumerType -> Z2
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> T0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> u1
+    com.android.tools.r8.graph.DexType listType -> R2
+    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> L
+    com.android.tools.r8.graph.DexType stringBufferType -> J2
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> k3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> i3
+    com.android.tools.r8.graph.DexType autoCloseableType -> H2
+    com.android.tools.r8.graph.DexString isEmptyMethodName -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> G0
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
-    com.android.tools.r8.graph.DexType optionalType -> a3
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> Y3
-    com.android.tools.r8.graph.DexType charType -> X1
-    com.android.tools.r8.graph.DexType iterableType -> y2
+    com.android.tools.r8.graph.DexString invokeMethodName -> G0
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> h1
+    com.android.tools.r8.graph.DexType runnableType -> a3
+    com.android.tools.r8.graph.DexString objectDescriptor -> O0
+    com.android.tools.r8.graph.DexString mapDescriptor -> p1
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> Y3
+    com.android.tools.r8.graph.DexType byteType -> X1
+    com.android.tools.r8.graph.DexType collectionsType -> y2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> i
-    com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.DexString getTypeNameName -> x0
-    com.android.tools.r8.graph.DexType annotationSignature -> Q3
-    com.android.tools.r8.graph.DexType stringArrayType -> q2
-    com.android.tools.r8.graph.DexType boxedFloatType -> i2
-    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> G1
-    com.android.tools.r8.graph.DexString containsMethodName -> V
+    com.android.tools.r8.graph.DexString boxedByteDescriptor -> E
+    com.android.tools.r8.graph.DexString getSimpleNameName -> x0
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> Q3
+    com.android.tools.r8.graph.DexType stringType -> q2
+    com.android.tools.r8.graph.DexType boxedDoubleType -> i2
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> H3
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> G1
+    com.android.tools.r8.graph.DexString lengthMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
-    com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType lookupType -> b4
-    com.android.tools.r8.graph.DexType intType -> a2
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> E3
-    com.android.tools.r8.graph.DexString constructorMethodName -> O1
-    java.util.Set libraryClassesWithoutStaticInitialization -> u4
-    com.android.tools.r8.graph.DexString getClassMethodName -> o0
-    com.android.tools.r8.graph.DexType consumerType -> Y2
-    boolean $assertionsDisabled -> z4
+    com.android.tools.r8.graph.DexString cloneMethodName -> g0
+    com.android.tools.r8.graph.DexType callSiteType -> b4
+    boolean $assertionsDisabled -> A4
+    com.android.tools.r8.graph.DexType floatType -> a2
+    com.android.tools.r8.graph.DexString newUpdaterName -> O1
+    java.util.Set libraryTypesAssumedToBePresent -> u4
+    com.android.tools.r8.graph.DexString initMethodName -> o0
+    com.android.tools.r8.graph.DexType supplierType -> Y2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> q3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> j
-    com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
-    com.android.tools.r8.graph.DexString enumDescriptor -> W0
-    com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> x1
-    com.android.tools.r8.graph.DexType listType -> Q2
-    com.android.tools.r8.graph.DexType autoCloseableType -> G2
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> h3
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
-    com.android.tools.r8.graph.DexString invokeMethodName -> F0
-    com.android.tools.r8.graph.DexString startsWithMethodName -> W
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> y3
+    com.android.tools.r8.graph.DexString boxedCharDescriptor -> F
+    com.android.tools.r8.graph.DexString methodDescriptor -> W0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> x1
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> r3
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> Q2
+    com.android.tools.r8.graph.DexType methodType -> G2
+    com.android.tools.r8.graph.DexType throwableType -> h3
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> g1
+    com.android.tools.r8.graph.DexString assertionsDisabled -> F0
+    com.android.tools.r8.graph.DexString containsMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> u3
-    com.android.tools.r8.graph.DexString objectDescriptor -> N0
-    com.android.tools.r8.graph.DexString mapDescriptor -> o1
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> p4
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> N0
+    com.android.tools.r8.graph.DexString setDescriptor -> o1
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> A3
     boolean sorted -> s
-    com.android.tools.r8.graph.DexType byteType -> W1
-    com.android.tools.r8.graph.DexType collectionsType -> x2
+    com.android.tools.r8.graph.DexType booleanType -> W1
+    com.android.tools.r8.graph.DexType objectsType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> k
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> X3
-    com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    com.android.tools.r8.graph.DexString getSimpleNameName -> w0
-    com.android.tools.r8.graph.DexType stringType -> p2
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> P3
-    com.android.tools.r8.graph.DexType boxedDoubleType -> h2
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> G3
-    com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> F1
-    com.android.tools.r8.graph.DexString endsWithMethodName -> X
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> X3
+    com.android.tools.r8.graph.DexString unknownTypeName -> y4
+    com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> G
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> w0
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> p2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> P3
+    com.android.tools.r8.graph.DexType boxedCharType -> h2
+    java.util.IdentityHashMap internalSentinels -> z4
+    com.android.tools.r8.graph.DexType comparableType -> i4
+    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> f0
+    com.android.tools.r8.graph.DexString icceDescriptor -> F1
+    com.android.tools.r8.graph.DexString startsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.DexType callSiteType -> a4
-    com.android.tools.r8.graph.DexString initMethodName -> n0
-    com.android.tools.r8.graph.DexString newUpdaterName -> N1
-    java.util.Set libraryTypesAssumedToBePresent -> t4
-    com.android.tools.r8.graph.DexType supplierType -> X2
-    com.android.tools.r8.graph.DexString methodDescriptor -> V0
-    com.android.tools.r8.graph.DexString optionalDescriptor -> w1
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> z3
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> B3
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> q3
-    com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> P2
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> F3
+    com.android.tools.r8.graph.DexType metafactoryType -> a4
+    com.android.tools.r8.graph.DexString wrapperFieldName -> n0
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> N1
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> t4
+    com.android.tools.r8.graph.DexType callableType -> X2
+    com.android.tools.r8.graph.DexString fieldDescriptor -> V0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> w1
+    com.android.tools.r8.graph.DexString boxedFloatDescriptor -> H