Merge "Build hamcrest with core_current"