Snap for 10453563 from b9a2fa3696b83ff0b212ce0f5b204a55c2377627 to mainline-tzdata5-release

Change-Id: I7df445ab84935524ac18580da536c0de2a6f5b6e
diff --git a/r8.jar b/r8.jar
index af978b5..694bee7 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 2bc5acd..7b61bb9 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,10 +1,10 @@
 # compiler: R8
-# compiler_version: 8.2.2-dev
+# compiler_version: 8.2.2-udc01
 # compiler_hash: engineering
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"2.2"}
-# pg_map_id: 8.2.2-dev
-# pg_map_hash: SHA-256 53a55043254cc5be8ef500331bba25d1b4ca4bc2cd66c555d4358bf672a1f10a
+# pg_map_id: 8.2.2-udc01
+# pg_map_hash: SHA-256 5e13c494445163188d7e823222320f7b56419224676bc027428d0599d6e06e33
 com.android.tools.r8.ArchiveClassFileProvider -> com.android.tools.r8.ArchiveClassFileProvider:
 # {"id":"sourceFile","fileName":"ArchiveClassFileProvider.java"}
     java.nio.file.Path archive -> a
@@ -21843,59 +21843,59 @@
     204:204:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.lens.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):201:201 -> a
     205:205:void computeMapping(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):227:227 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/m;ILcom/android/tools/r8/utils/z3;Lcom/android/tools/r8/graph/e5;)V"}
-    206:206:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1131:1131 -> a
+    206:206:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1133:1133 -> a
     206:206:void computeMapping(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    207:208:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1131:1132 -> a
-    207:208:void computeMapping(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):227 -> a
-    209:211:void computeMapping(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):227:229 -> a
-    212:212:void addClass(com.android.tools.r8.graph.DexProgramClass):247:247 -> a
+    207:214:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1133:1140 -> a
+    207:214:void computeMapping(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):227 -> a
+    215:217:void computeMapping(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):227:229 -> a
+    218:218:void addClass(com.android.tools.r8.graph.DexProgramClass):247:247 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q2;)V"}
-    213:213:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):989:989 -> a
-    213:213:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
+    219:219:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):989:989 -> a
+    219:219:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    214:214:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):989:989 -> a
-    214:214:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
-    215:215:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassDone():1005:1005 -> a
-    215:215:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):990 -> a
-    215:215:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
-    216:217:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):991:992 -> a
-    216:217:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
-    218:218:boolean isFull(int):251:251 -> a
-    219:219:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055:1055 -> a
-    219:219:boolean isFull(int):251 -> a
+    220:220:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):989:989 -> a
+    220:220:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
+    221:221:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassDone():1005:1005 -> a
+    221:221:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):990 -> a
+    221:221:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
+    222:223:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):991:992 -> a
+    222:223:void addClass(com.android.tools.r8.graph.DexProgramClass):247 -> a
+    224:224:boolean isFull(int):251:251 -> a
+    225:225:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055:1055 -> a
+    225:225:boolean isFull(int):251 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    220:220:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055:1055 -> a
-    220:220:boolean isFull(int):251 -> a
-    221:221:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfMethods():703:703 -> a
-    221:221:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055 -> a
+    226:226:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055:1055 -> a
+    226:226:boolean isFull(int):251 -> a
+    227:227:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfMethods():703:703 -> a
+    227:227:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    221:221:boolean isFull(int):251 -> a
-    222:222:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfMethods():703:703 -> a
-    222:222:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055 -> a
-    222:222:boolean isFull(int):251 -> a
-    223:223:boolean isFull(int):251:251 -> a
-    224:224:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063:1063 -> a
-    224:224:boolean isFull(int):252 -> a
+    227:227:boolean isFull(int):251 -> a
+    228:228:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfMethods():703:703 -> a
+    228:228:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfMethods():1055 -> a
+    228:228:boolean isFull(int):251 -> a
+    229:229:boolean isFull(int):251:251 -> a
+    230:230:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063:1063 -> a
+    230:230:boolean isFull(int):252 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    225:225:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063:1063 -> a
-    225:225:boolean isFull(int):252 -> a
-    226:226:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfFields():707:707 -> a
-    226:226:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063 -> a
+    231:231:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063:1063 -> a
+    231:231:boolean isFull(int):252 -> a
+    232:232:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfFields():707:707 -> a
+    232:232:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    226:226:boolean isFull(int):252 -> a
-    227:227:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfFields():707:707 -> a
-    227:227:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063 -> a
-    227:227:boolean isFull(int):252 -> a
-    228:228:void abortTransaction():281:281 -> a
-    229:229:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.abort():1120:1120 -> a
-    229:229:void abortTransaction():281 -> a
+    232:232:boolean isFull(int):252 -> a
+    233:233:int com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection.getNumberOfFields():707:707 -> a
+    233:233:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfFields():1063 -> a
+    233:233:boolean isFull(int):252 -> a
+    234:234:void abortTransaction():281:281 -> a
+    235:235:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.abort():1120:1120 -> a
+    235:235:void abortTransaction():281 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    230:237:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.abort():1120:1127 -> a
-    230:237:void abortTransaction():281 -> a
-    238:238:boolean containsString(com.android.tools.r8.graph.DexString):289:289 -> a
+    236:245:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.abort():1120:1129 -> a
+    236:245:void abortTransaction():281 -> a
+    246:246:boolean containsString(com.android.tools.r8.graph.DexString):289:289 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u2;)Z"}
-    239:239:boolean containsType(com.android.tools.r8.graph.DexType):293:293 -> a
+    247:247:boolean containsType(com.android.tools.r8.graph.DexType):293:293 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/v2;)Z"}
     1:1:void injectString(com.android.tools.r8.graph.DexString):191:191 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u2;)V"}
@@ -22197,346 +22197,346 @@
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.dex.VirtualFile$VirtualFileCycler cycler -> e
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():1261:1261 -> <clinit>
-    1:7:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.utils.IntBox):1375:1381 -> <init>
+    1:1:void <clinit>():1268:1268 -> <clinit>
+    1:7:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.utils.IntBox):1382:1388 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;Lcom/android/tools/r8/graph/m;Ljava/util/Collection;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/AW;Lcom/android/tools/r8/utils/m1;)V"}
-    1:1:void addStartupClasses():1407:1407 -> a
-    1:1:void run():1401 -> a
-    2:2:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getStartupClasses():1342:1342 -> a
-    2:2:void addStartupClasses():1407 -> a
+    1:1:void addStartupClasses():1414:1414 -> a
+    1:1:void run():1408 -> a
+    2:2:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getStartupClasses():1349:1349 -> a
+    2:2:void addStartupClasses():1414 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void run():1401 -> a
-    3:12:void addStartupClasses():1408:1417 -> a
-    3:12:void run():1401 -> a
-    13:13:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getStartupClasses():1342:1342 -> a
-    13:13:void addStartupClasses():1417 -> a
+    2:2:void run():1408 -> a
+    3:12:void addStartupClasses():1415:1424 -> a
+    3:12:void run():1408 -> a
+    13:13:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getStartupClasses():1349:1349 -> a
+    13:13:void addStartupClasses():1424 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:void run():1401 -> a
-    14:18:void addStartupClasses():1417:1421 -> a
-    14:18:void run():1401 -> a
+    13:13:void run():1408 -> a
+    14:18:void addStartupClasses():1424:1428 -> a
+    14:18:void run():1408 -> a
     19:19:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    19:19:void addStartupClasses():1422 -> a
+    19:19:void addStartupClasses():1429 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:void run():1401 -> a
+    19:19:void run():1408 -> a
     20:20:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    20:20:void addStartupClasses():1422 -> a
-    20:20:void run():1401 -> a
-    21:24:void addStartupClasses():1424:1427 -> a
-    21:24:void run():1401 -> a
-    25:25:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getStartupClasses():1342:1342 -> a
-    25:25:void addStartupClasses():1427 -> a
+    20:20:void addStartupClasses():1429 -> a
+    20:20:void run():1408 -> a
+    21:24:void addStartupClasses():1431:1434 -> a
+    21:24:void run():1408 -> a
+    25:25:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getStartupClasses():1349:1349 -> a
+    25:25:void addStartupClasses():1434 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    25:25:void run():1401 -> a
-    26:28:void addStartupClasses():1427:1429 -> a
-    26:28:void run():1401 -> a
+    25:25:void run():1408 -> a
+    26:28:void addStartupClasses():1434:1436 -> a
+    26:28:void run():1408 -> a
     29:29:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    29:29:void addStartupClasses():1430 -> a
-    29:29:void run():1401 -> a
-    30:31:void addStartupClasses():1432:1433 -> a
-    30:31:void run():1401 -> a
-    32:32:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1231:1231 -> a
-    32:32:void addStartupClasses():1433 -> a
+    29:29:void addStartupClasses():1437 -> a
+    29:29:void run():1408 -> a
+    30:31:void addStartupClasses():1439:1440 -> a
+    30:31:void run():1408 -> a
+    32:32:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1238:1238 -> a
+    32:32:void addStartupClasses():1440 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:void run():1401 -> a
-    33:33:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1232:1232 -> a
-    33:33:void addStartupClasses():1433 -> a
-    33:33:void run():1401 -> a
-    34:35:void addStartupClasses():1434:1435 -> a
-    34:35:void run():1401 -> a
+    32:32:void run():1408 -> a
+    33:33:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1239:1239 -> a
+    33:33:void addStartupClasses():1440 -> a
+    33:33:void run():1408 -> a
+    34:35:void addStartupClasses():1441:1442 -> a
+    34:35:void run():1408 -> a
     36:36:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    36:36:void addStartupClasses():1436 -> a
-    36:36:void run():1401 -> a
-    37:38:void addStartupClasses():1441:1442 -> a
-    37:38:void run():1401 -> a
-    39:39:void com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.clearFilesForDistribution():1177:1177 -> a
-    39:39:void addStartupClasses():1442 -> a
+    36:36:void addStartupClasses():1443 -> a
+    36:36:void run():1408 -> a
+    37:38:void addStartupClasses():1448:1449 -> a
+    37:38:void run():1408 -> a
+    39:39:void com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.clearFilesForDistribution():1184:1184 -> a
+    39:39:void addStartupClasses():1449 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:void run():1401 -> a
-    40:41:void com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.clearFilesForDistribution():1177:1178 -> a
-    40:41:void addStartupClasses():1442 -> a
-    40:41:void run():1401 -> a
-    42:42:void addStartupClasses():1444:1444 -> a
-    42:42:void run():1401 -> a
-    43:43:java.util.List addNonStartupClasses():1452:1452 -> a
-    43:43:void run():1402 -> a
+    39:39:void run():1408 -> a
+    40:41:void com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.clearFilesForDistribution():1184:1185 -> a
+    40:41:void addStartupClasses():1449 -> a
+    40:41:void run():1408 -> a
+    42:42:void addStartupClasses():1451:1451 -> a
+    42:42:void run():1408 -> a
+    43:43:java.util.List addNonStartupClasses():1459:1459 -> a
+    43:43:void run():1409 -> a
     44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
-    44:44:java.util.List addNonStartupClasses():1452 -> a
-    44:44:void run():1402 -> a
-    45:45:java.util.List addNonStartupClasses():1453:1453 -> a
-    45:45:void run():1402 -> a
-    46:46:com.android.tools.r8.dex.VirtualFile$VirtualFileCycler com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.ensureFile():1244:1244 -> a
-    46:46:java.util.List addNonStartupClasses():1453 -> a
+    44:44:java.util.List addNonStartupClasses():1459 -> a
+    44:44:void run():1409 -> a
+    45:45:java.util.List addNonStartupClasses():1460:1460 -> a
+    45:45:void run():1409 -> a
+    46:46:com.android.tools.r8.dex.VirtualFile$VirtualFileCycler com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.ensureFile():1251:1251 -> a
+    46:46:java.util.List addNonStartupClasses():1460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:void run():1402 -> a
-    47:47:com.android.tools.r8.dex.VirtualFile$VirtualFileCycler com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.ensureFile():1244:1244 -> a
-    47:47:java.util.List addNonStartupClasses():1453 -> a
-    47:47:void run():1402 -> a
-    48:49:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1231:1232 -> a
-    48:49:com.android.tools.r8.dex.VirtualFile$VirtualFileCycler com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.ensureFile():1245 -> a
-    48:49:java.util.List addNonStartupClasses():1453 -> a
-    48:49:void run():1402 -> a
-    50:51:java.util.List addNonStartupClasses():1453:1454 -> a
-    50:51:void run():1402 -> a
-    52:52:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getNonStartupClasses():1346:1346 -> a
-    52:52:java.util.List addNonStartupClasses():1454 -> a
+    46:46:void run():1409 -> a
+    47:47:com.android.tools.r8.dex.VirtualFile$VirtualFileCycler com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.ensureFile():1251:1251 -> a
+    47:47:java.util.List addNonStartupClasses():1460 -> a
+    47:47:void run():1409 -> a
+    48:49:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1238:1239 -> a
+    48:49:com.android.tools.r8.dex.VirtualFile$VirtualFileCycler com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.ensureFile():1252 -> a
+    48:49:java.util.List addNonStartupClasses():1460 -> a
+    48:49:void run():1409 -> a
+    50:51:java.util.List addNonStartupClasses():1460:1461 -> a
+    50:51:void run():1409 -> a
+    52:52:java.util.List com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning.getNonStartupClasses():1353:1353 -> a
+    52:52:java.util.List addNonStartupClasses():1461 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:52:void run():1402 -> a
-    53:55:java.util.List addNonStartupClasses():1455:1457 -> a
-    53:55:void run():1402 -> a
-    56:56:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):1397:1397 -> a
-    56:56:java.util.List addNonStartupClasses():1458 -> a
-    56:56:void run():1402 -> a
-    57:61:boolean coveredByPrefix(java.lang.String,java.lang.String):1388:1392 -> a
-    57:61:java.util.List addNonStartupClasses():1459 -> a
-    57:61:void run():1402 -> a
+    52:52:void run():1409 -> a
+    53:55:java.util.List addNonStartupClasses():1462:1464 -> a
+    53:55:void run():1409 -> a
+    56:56:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):1404:1404 -> a
+    56:56:java.util.List addNonStartupClasses():1465 -> a
+    56:56:void run():1409 -> a
+    57:61:boolean coveredByPrefix(java.lang.String,java.lang.String):1395:1399 -> a
+    57:61:java.util.List addNonStartupClasses():1466 -> a
+    57:61:void run():1409 -> a
     62:62:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    62:62:java.util.List addNonStartupClasses():1461 -> a
+    62:62:java.util.List addNonStartupClasses():1468 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    62:62:void run():1402 -> a
+    62:62:void run():1409 -> a
     63:63:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    63:63:java.util.List addNonStartupClasses():1461 -> a
-    63:63:void run():1402 -> a
-    64:64:java.util.List addNonStartupClasses():1462:1462 -> a
-    64:64:void run():1402 -> a
-    65:66:boolean verifyPackageToVirtualFileAssignment(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.String,com.android.tools.r8.dex.VirtualFile):1568:1569 -> a
-    65:66:java.util.List addNonStartupClasses():1462 -> a
-    65:66:void run():1402 -> a
-    67:95:java.util.List addNonStartupClasses():1464:1492 -> a
-    67:95:void run():1402 -> a
-    96:96:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1131:1131 -> a
-    96:96:java.util.List addNonStartupClasses():1492 -> a
-    96:96:void run():1402 -> a
+    63:63:java.util.List addNonStartupClasses():1468 -> a
+    63:63:void run():1409 -> a
+    64:64:java.util.List addNonStartupClasses():1469:1469 -> a
+    64:64:void run():1409 -> a
+    65:66:boolean verifyPackageToVirtualFileAssignment(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.String,com.android.tools.r8.dex.VirtualFile):1575:1576 -> a
+    65:66:java.util.List addNonStartupClasses():1469 -> a
+    65:66:void run():1409 -> a
+    67:95:java.util.List addNonStartupClasses():1471:1499 -> a
+    67:95:void run():1409 -> a
+    96:96:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1133:1133 -> a
+    96:96:java.util.List addNonStartupClasses():1499 -> a
+    96:96:void run():1409 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    97:98:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1131:1132 -> a
-    97:98:java.util.List addNonStartupClasses():1492 -> a
-    97:98:void run():1402 -> a
-    99:107:java.util.List addNonStartupClasses():1492:1500 -> a
-    99:107:void run():1402 -> a
-    108:108:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
-    108:108:java.util.List addNonStartupClasses():1505 -> a
-    108:108:void run():1402 -> a
-    109:109:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    109:109:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    97:104:boolean com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.isEmpty():1133:1140 -> a
+    97:104:java.util.List addNonStartupClasses():1499 -> a
+    97:104:void run():1409 -> a
+    105:113:java.util.List addNonStartupClasses():1499:1507 -> a
+    105:113:void run():1409 -> a
+    114:114:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
+    114:114:java.util.List addNonStartupClasses():1512 -> a
+    114:114:void run():1409 -> a
+    115:115:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    115:115:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    109:109:java.util.List addNonStartupClasses():1505 -> a
-    109:109:void run():1402 -> a
-    110:110:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    110:110:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
-    110:110:java.util.List addNonStartupClasses():1505 -> a
-    110:110:void run():1402 -> a
-    111:127:java.util.List addNonStartupClasses():1507:1523 -> a
-    111:127:void run():1402 -> a
-    128:128:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1187:1187 -> a
-    128:128:java.util.List addNonStartupClasses():1523 -> a
+    115:115:java.util.List addNonStartupClasses():1512 -> a
+    115:115:void run():1409 -> a
+    116:116:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    116:116:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    116:116:java.util.List addNonStartupClasses():1512 -> a
+    116:116:void run():1409 -> a
+    117:133:java.util.List addNonStartupClasses():1514:1530 -> a
+    117:133:void run():1409 -> a
+    134:134:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1194:1194 -> a
+    134:134:java.util.List addNonStartupClasses():1530 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    128:128:void run():1402 -> a
-    129:129:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1187:1187 -> a
-    129:129:java.util.List addNonStartupClasses():1523 -> a
-    129:129:void run():1402 -> a
-    130:137:java.util.List addNonStartupClasses():1526:1533 -> a
-    130:137:void run():1402 -> a
-    138:138:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1231:1231 -> a
-    138:138:java.util.List addNonStartupClasses():1533 -> a
+    134:134:void run():1409 -> a
+    135:135:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1194:1194 -> a
+    135:135:java.util.List addNonStartupClasses():1530 -> a
+    135:135:void run():1409 -> a
+    136:143:java.util.List addNonStartupClasses():1533:1540 -> a
+    136:143:void run():1409 -> a
+    144:144:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1238:1238 -> a
+    144:144:java.util.List addNonStartupClasses():1540 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    138:138:void run():1402 -> a
-    139:139:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1232:1232 -> a
-    139:139:java.util.List addNonStartupClasses():1533 -> a
-    139:139:void run():1402 -> a
-    140:140:java.util.List addNonStartupClasses():1538:1538 -> a
-    140:140:void run():1402 -> a
-    141:141:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    141:141:java.util.List addNonStartupClasses():1543 -> a
+    144:144:void run():1409 -> a
+    145:145:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1239:1239 -> a
+    145:145:java.util.List addNonStartupClasses():1540 -> a
+    145:145:void run():1409 -> a
+    146:146:java.util.List addNonStartupClasses():1545:1545 -> a
+    146:146:void run():1409 -> a
+    147:147:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
+    147:147:java.util.List addNonStartupClasses():1550 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    141:141:void run():1402 -> a
-    142:142:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
-    142:142:java.util.List addNonStartupClasses():1543 -> a
-    142:142:void run():1402 -> a
-    143:143:java.util.List addNonStartupClasses():1544:1544 -> a
-    143:143:void run():1402 -> a
-    144:145:boolean verifyPackageToVirtualFileAssignment(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.String,com.android.tools.r8.dex.VirtualFile):1568:1569 -> a
-    144:145:java.util.List addNonStartupClasses():1545 -> a
-    144:145:void run():1402 -> a
-    146:146:void run():1403:1403 -> a
-    147:152:java.lang.String extractPrefixToken(int,java.lang.String,boolean):1556:1561 -> a
-    153:153:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1578:1578 -> a
-    153:153:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1574 -> a
+    147:147:void run():1409 -> a
+    148:148:void com.android.tools.r8.dex.VirtualFile.commitTransaction():285:285 -> a
+    148:148:java.util.List addNonStartupClasses():1550 -> a
+    148:148:void run():1409 -> a
+    149:149:java.util.List addNonStartupClasses():1551:1551 -> a
+    149:149:void run():1409 -> a
+    150:151:boolean verifyPackageToVirtualFileAssignment(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.String,com.android.tools.r8.dex.VirtualFile):1575:1576 -> a
+    150:151:java.util.List addNonStartupClasses():1552 -> a
+    150:151:void run():1409 -> a
+    152:152:void run():1410:1410 -> a
+    153:158:java.lang.String extractPrefixToken(int,java.lang.String,boolean):1563:1568 -> a
+    159:159:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1585:1585 -> a
+    159:159:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1581 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/r0;Lcom/android/tools/r8/utils/A1;)Z"}
-    154:154:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
-    154:154:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
+    160:160:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
+    160:160:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    154:154:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1574 -> a
-    155:155:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    155:155:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    160:160:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1581 -> a
+    161:161:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    161:161:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    155:155:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    155:155:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1574 -> a
-    156:156:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    156:156:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
-    156:156:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    156:156:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1574 -> a
-    157:157:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579:1579 -> a
-    157:157:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1574 -> a
-    158:158:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
-    158:158:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1582 -> a
+    161:161:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    161:161:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1581 -> a
+    162:162:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    162:162:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    162:162:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    162:162:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1581 -> a
+    163:163:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586:1586 -> a
+    163:163:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1581 -> a
+    164:164:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
+    164:164:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    158:158:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1574 -> a
-    159:166:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1587:1594 -> a
+    164:164:boolean hasSpaceForTransaction(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1581 -> a
+    165:172:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1594:1601 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/p0;Ljava/util/ArrayList;)V"}
-    167:167:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1187:1187 -> a
-    167:167:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
+    173:173:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1194:1194 -> a
+    173:173:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    167:167:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    168:168:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1187:1187 -> a
-    168:168:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    168:168:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    169:169:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615:1615 -> a
-    169:169:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    170:170:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1578:1578 -> a
-    170:170:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    170:170:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    171:171:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
-    171:171:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
+    173:173:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    174:174:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1194:1194 -> a
+    174:174:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    174:174:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    175:175:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622:1622 -> a
+    175:175:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    176:176:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1585:1585 -> a
+    176:176:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    176:176:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    177:177:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
+    177:177:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    171:171:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    171:171:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    172:172:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    172:172:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    177:177:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    177:177:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    178:178:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    178:178:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    172:172:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    172:172:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    172:172:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    173:173:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    173:173:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
-    173:173:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    173:173:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    173:173:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    174:174:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579:1579 -> a
-    174:174:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    174:174:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    175:175:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
-    175:175:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1582 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    175:175:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    175:175:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    176:176:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616:1616 -> a
-    176:176:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    177:177:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1578:1578 -> a
-    177:177:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    177:177:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    178:178:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
-    178:178:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    178:178:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    178:178:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
+    178:178:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    178:178:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    178:178:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
     179:179:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
     179:179:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    179:179:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    179:179:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    179:179:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    180:180:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586:1586 -> a
+    180:180:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    180:180:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    181:181:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
+    181:181:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    179:179:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    179:179:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    179:179:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    180:180:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    180:180:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
-    180:180:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    180:180:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    180:180:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    181:181:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579:1579 -> a
-    181:181:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    181:181:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    182:182:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
-    182:182:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1582 -> a
+    181:181:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    181:181:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    182:182:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623:1623 -> a
+    182:182:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    183:183:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1585:1585 -> a
+    183:183:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    183:183:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    184:184:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
+    184:184:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    182:182:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    182:182:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    183:184:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1231:1232 -> a
-    183:184:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1617 -> a
-    183:184:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1595 -> a
-    185:188:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1597:1600 -> a
-    189:189:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1187:1187 -> a
-    189:189:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
+    184:184:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    184:184:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    185:185:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    185:185:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    189:189:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    190:190:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1187:1187 -> a
-    190:190:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    190:190:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    191:191:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615:1615 -> a
-    191:191:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    192:192:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1578:1578 -> a
-    192:192:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    192:192:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    193:193:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
-    193:193:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
+    185:185:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    185:185:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    185:185:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    186:186:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    186:186:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    186:186:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    186:186:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    186:186:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    187:187:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586:1586 -> a
+    187:187:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    187:187:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    188:188:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
+    188:188:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    193:193:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    193:193:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    194:194:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    194:194:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    188:188:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    188:188:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    189:190:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1238:1239 -> a
+    189:190:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1624 -> a
+    189:190:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602 -> a
+    191:194:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1604:1607 -> a
+    195:195:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1194:1194 -> a
+    195:195:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    194:194:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    194:194:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    194:194:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    195:195:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    195:195:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
-    195:195:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    195:195:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    195:195:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    196:196:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579:1579 -> a
-    196:196:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    196:196:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    197:197:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
-    197:197:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1582 -> a
+    195:195:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    196:196:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1194:1194 -> a
+    196:196:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    196:196:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    197:197:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622:1622 -> a
+    197:197:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    198:198:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1585:1585 -> a
+    198:198:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    198:198:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    199:199:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
+    199:199:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    197:197:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1615 -> a
-    197:197:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    198:198:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616:1616 -> a
-    198:198:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    199:199:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1578:1578 -> a
-    199:199:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    199:199:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    200:200:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
-    200:200:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
+    199:199:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    199:199:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    200:200:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    200:200:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    200:200:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    200:200:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
+    200:200:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    200:200:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    200:200:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
     201:201:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
     201:201:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    201:201:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    201:201:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    201:201:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    202:202:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586:1586 -> a
+    202:202:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    202:202:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    203:203:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
+    203:203:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    201:201:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    201:201:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    201:201:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    202:202:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
-    202:202:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
-    202:202:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579 -> a
-    202:202:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    202:202:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    203:203:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1579:1579 -> a
-    203:203:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    203:203:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    204:204:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
-    204:204:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1582 -> a
+    203:203:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1622 -> a
+    203:203:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    204:204:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623:1623 -> a
+    204:204:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    205:205:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1585:1585 -> a
+    205:205:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    205:205:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    206:206:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268:268 -> a
+    206:206:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    204:204:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1616 -> a
-    204:204:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    205:206:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1231:1232 -> a
-    205:206:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1617 -> a
-    205:206:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1601 -> a
-    207:214:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1602:1609 -> a
+    206:206:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    206:206:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    207:207:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    207:207:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    207:207:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    207:207:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    207:207:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    208:208:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1059:1059 -> a
+    208:208:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():268 -> a
+    208:208:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586 -> a
+    208:208:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    208:208:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    209:209:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1586:1586 -> a
+    209:209:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    209:209:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    210:210:boolean com.android.tools.r8.dex.VirtualFile.isFull():256:256 -> a
+    210:210:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1589 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    210:210:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1623 -> a
+    210:210:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    211:212:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.addFile():1238:1239 -> a
+    211:212:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1624 -> a
+    211:212:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1608 -> a
+    213:220:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1609:1616 -> a
 com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning -> com.android.tools.r8.dex.n0:
 # {"id":"sourceFile","fileName":"VirtualFile.java"}
     java.util.List startupClasses -> a
     java.util.List nonStartupClasses -> b
-    1:3:void <init>(java.util.List,java.util.List):1274:1276 -> <init>
+    1:3:void <init>(java.util.List,java.util.List):1281:1283 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/ArrayList;)V"}
-    1:2:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):1285:1286 -> a
+    1:2:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):1292:1293 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/AW;)Lcom/android/tools/r8/dex/n0;"}
-    3:14:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Comparator,java.util.function.Predicate):1293:1304 -> a
-    3:14:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):1283 -> a
-    15:15:java.util.Comparator getClassesByPackageComparator(java.util.Map):1309:1309 -> a
+    3:14:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Comparator,java.util.function.Predicate):1300:1311 -> a
+    3:14:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):1290 -> a
+    15:15:java.util.Comparator getClassesByPackageComparator(java.util.Map):1316:1316 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;)Ljava/util/Comparator;"}
-    16:38:int lambda$getClassesByPackageComparator$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1310:1332 -> a
+    16:38:int lambda$getClassesByPackageComparator$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1317:1339 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/q2;Lcom/android/tools/r8/graph/q2;)I"}
-    39:39:java.util.function.Predicate getStartupClassPredicate(com.android.tools.r8.profile.startup.profile.StartupProfile):1338:1338 -> a
+    39:39:java.util.function.Predicate getStartupClassPredicate(com.android.tools.r8.profile.startup.profile.StartupProfile):1345:1345 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AW;)Ljava/util/function/Predicate;"}
-    40:40:boolean lambda$getStartupClassPredicate$1(com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.DexProgramClass):1338:1338 -> a
+    40:40:boolean lambda$getStartupClassPredicate$1(com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.DexProgramClass):1345:1345 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AW;Lcom/android/tools/r8/graph/q2;)Z"}
 com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.dex.p0:
 # {"id":"sourceFile","fileName":"VirtualFile.java"}
@@ -22548,22 +22548,22 @@
     java.util.Iterator activeFiles -> f
     com.android.tools.r8.FeatureSplit featureSplit -> g
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():1148:1148 -> <clinit>
-    1:11:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.IntBox):1163:1173 -> <init>
+    1:1:void <clinit>():1155:1155 -> <clinit>
+    1:11:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.IntBox):1170:1180 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/m;Lcom/android/tools/r8/utils/m1;)V"}
-    1:1:boolean hasNext():1187:1187 -> a
-    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate():1198 -> a
-    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):1215 -> a
+    1:1:boolean hasNext():1194:1194 -> a
+    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate():1205 -> a
+    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):1222 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/dex/r0;"}
-    2:5:com.android.tools.r8.dex.VirtualFile nextOrCreate():1199:1202 -> a
-    2:5:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):1215 -> a
-    6:9:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):1216:1219 -> a
-    10:12:com.android.tools.r8.dex.VirtualFile internalAddFile():1237:1239 -> a
+    2:5:com.android.tools.r8.dex.VirtualFile nextOrCreate():1206:1209 -> a
+    2:5:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):1222 -> a
+    6:9:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):1223:1226 -> a
+    10:12:com.android.tools.r8.dex.VirtualFile internalAddFile():1244:1246 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/r0;"}
-    1:1:com.android.tools.r8.dex.VirtualFile next():1191:1191 -> b
+    1:1:com.android.tools.r8.dex.VirtualFile next():1198:1198 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/r0;"}
-    1:2:void reset():1182:1183 -> c
-    1:1:void restart():1227:1227 -> d
+    1:2:void reset():1189:1190 -> c
+    1:1:void restart():1234:1234 -> d
 com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.dex.q0:
 # {"id":"sourceFile","fileName":"VirtualFile.java"}
     java.util.Set classes -> a