Merge remote-tracking branch 'aosp/upstream-master' into master
* aosp/upstream-master:
Perform best-effort unescaping of command line options
Fix error reporting for resolution failures on nested annotations
Don't crash on type variables used as qualifiers in const exprs
Use a newer version of guava
Fix an NPE in constant expression binding of malformed annotations
Reformat with google-java-format
Miscellaneous cleanups
Report diagnostics for unterminated expressions at the beginning of the expression instead of at the end of the file, which is probably farther from the problem.
Fix error reporting for import resolution errors on nested types
Add flag control for the reduced classpath optimization
Bug: 122929601
Test: m checkbuild
Change-Id: I30c0efadd5379f668772bc047d54ccfbbce118f8
