extract matches method from MatchFinder:
Instead of inheritance by overriding matches, use composition of
a predicate.

organize imports.

Change-Id: I1aa95cb14822fb27151cda8bdffd61580b49c5e3
6 files changed