No-op cleanup. Replaced direct usages of Hamcrest implementation classes (those are located differently in different versions of Hamcrest) with using Matchers' factory methods.

Signed-off-by: Jason Leyba <jmleyba@gmail.com>