Merge "Build hamcrest with core_current" am: 8ac829b3c6
am: 3f279fec9c

Change-Id: If855e700d9c96455ccc7f3ae749e5c0f7ee7298e