Revert "Add ClassnameMatcher in preparation to pass into Instrumenter for filtering" am: 10750c3a7c
am: 293b0ecef8

Change-Id: I13832b72e33db16f9eb54805c2d6ded296091de6