Merge "Build hamcrest with core_current"
am: 8ac829b3c6

Change-Id: I1a4a2ee8cd46d75a08855390c37aef3a75bf3bef