Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath""