Matcher: Reduce diff vs. upstream OpenJDK 8u121-b13 (refactor part 4).

In this CL:

 - reorder some fields, make them package private
 - move declaration of fields from, to onto the same line
 - take upstream docs for some of those fields

This CL does not change behavior.

Bug: 80416774
Test: Treehugger
Test: CtsLibcoreTestCases (at a later CL)

Change-Id: I63d44745544b1a4c7e08681716ae6a59c6e246d2
1 file changed