Merge remote-tracking branch 'aosp/upstream-master' into master
* aosp/upstream-master:
Clean up android desugar tool's flags a bit
Change how desugar finds desugared classes to have it working on Windows
Remove bootclasspath fallback in Android desugaring tool
Add an --copy_bridges_from_classpath argument
Desugar calls to Objects.requireNonNull(Object o) to o.getClass()
Avoid factory methods when desugaring stateless lambdas for Android RELNOTES: Avoid factory methods when desugaring stateless lambdas for Android
Remove duplicate class.
More stable naming scheme for lambda classes in desugared android code RELNOTES: More stable naming scheme for lambda classes in desugared android code
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I0ff5b9eb3cac6a020f347c51b79633af13b0576f