Merge "Allow Mockito to compile against external/hamcrest v2.0"