Version 3.3.20-dev+aosp10

Ignore option `--command_cache_dir` passed by buildbot to tools/test.py.

Test: tools/test.py \
    '--runtimes=dex-default' \
    '--command_cache_dir=/tmp/ccache' \
    '--tool=r8' \
    --print-times \
    --no_internal \
    --one_line_per_test \
    --archive_failures
Bug: b/281536562
Change-Id: I829c97cbd0fa05591119d52c765cd053416d0194
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 00ba439..c16cdee 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,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 = "3.3.20-dev+aosp9";
+  public static final String LABEL = "3.3.20-dev+aosp10";
 
   private Version() {
   }
diff --git a/tools/test.py b/tools/test.py
index ec4bb00..147d30b 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -119,6 +119,11 @@
       help='Use a custom directory for the test artifacts instead of a'
           ' temporary (which is automatically removed after the test).'
           ' Note that the directory will not be cleared before the test.')
+  result.add_option(
+      '--command-cache-dir',
+      '--command_cache_dir',
+      help='Cache command invocations to this directory, speeds up test runs',
+      default=os.environ.get('R8_COMMAND_CACHE_DIR'))
   result.add_option('--java-home', '--java_home',
       help='Use a custom java version to run tests.')
   result.add_option('--java-max-memory-size', '--java_max_memory_size',