Merge "Remove hamcrest-integration"
am: f1015b50e7

Change-Id: I3385ea2635f4a07148585686cd97647efe8a1907