Ensure we sort mappers before comparing

Change-Id: I2ae720d85833765488d6d098be7307b9c0deede8
diff --git a/src/test/java/com/android/tools/r8/internal/GMSCoreV10ProguardMapReaderTest.java b/src/test/java/com/android/tools/r8/internal/GMSCoreV10ProguardMapReaderTest.java
index 2c2742a..58bef78 100644
--- a/src/test/java/com/android/tools/r8/internal/GMSCoreV10ProguardMapReaderTest.java
+++ b/src/test/java/com/android/tools/r8/internal/GMSCoreV10ProguardMapReaderTest.java
@@ -17,8 +17,9 @@
   @Test
   public void roundTripTestGmsCoreV10() throws IOException {
     Path map = Paths.get(APP_DIR).resolve(PG_MAP);
-    ClassNameMapper firstMapper = ClassNameMapper.mapperFromFile(map);
-    ClassNameMapper secondMapper = ClassNameMapper.mapperFromString(firstMapper.toString());
+    ClassNameMapper firstMapper = ClassNameMapper.mapperFromFile(map).sorted();
+    ClassNameMapper secondMapper =
+        ClassNameMapper.mapperFromString(firstMapper.toString()).sorted();
     Assert.assertEquals(firstMapper, secondMapper);
   }
 }