Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath""
am: 9758900b56

Change-Id: I72160219c0559e39b83df007f7c607cbed8db5a1