Merge commit '825c964d58326b0e68b4baa76ebe8786ede4a0eb' into dev-release

Change-Id: I4d0001805440ef2f7301f85b53c0b356b341ece7

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index b725385..72e674a 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -13,7 +13,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "main";
+  public static final String LABEL = "8.4.1-dev";
 
   private Version() {
   }