Make PathAwareDiagnosingMatcher and TextSubstitutingDescription classes private.

They are not part of the public API.
Correct minor inconsistency in javadoc formatting.