Merge remote-tracking branch 'aosp/upstream-master' into master
* aosp/upstream-master:
Add expansion functions to options parser
Add support to write desugared outputs to a directory RELNOTES: n/a
Add name of missing class to ClassNotFoundException
Add support to read inputs from directories
Create "internal" category of command-line options.
Refactor options converter logic
Add a flag (--only_desugar_javac9_for_lint) to disable desugaring lambda expressions for Android Lint.
Test: m -j ANDROID_COMPILE_WITH_JACK=false checkbuild