Format type annotation as part of the type, not part of the modifiers list

[mernst]

This pull request cherry-picks commit https://github.com/google/google-java-format/commit/865cff01, "Format type annotation as part of the type, not part of the modifiers list" from google-java-format. It includes a few other changes that are needed by that commit, or that reduce the size of the diffs against google-java-format.

There are some changes to testdata/*.output files -- that is, to the expected output of the formatter. These relate to formatting of annotations and are due to changes in google-java-format.