Merge remote-tracking branch 'aosp/upstream-master' into desugar
* aosp/upstream-master:
Improve exception message to output more information. RELNOTES:None.
Remove static import of inner class InferredType's fields
Automatic code cleanup.
Let to push lambda arguments not only with *LOAD instructions but with SIPUSH and *CONST_*.
Fix canonical option list for options that implicitly require options with allowMultiple=true
Change config expansion application order, gated by startup flag --expand_configs_in_place.
Specialize $closeResource(Throwable, AutoCloseable) so that desugared code does not depend on AutoCloseable, as it is not available before API 19.
Fix EnclosingMethod attribute when moving interface methods to companion class RELNOTES: None.
Cleanup stream use in canonical list of options.
Remove unused LegacyParamsFilePreProcessor. Removed test cases from OptionsParserTest are implemented in ParamsFilePreProcessorTest, ShellQuotedParamsFilePreProcessorTest and UnquotedParamsFilePreProcessorTest.
Switch on tracking of specific option priorities.
Compute canonical list of options using OptionValueDescription's tracking of instances.
Test: m checkbuild
Change-Id: Idb762b0dabc9660d9116d1b976fb2f74aa7f5e09