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

Change-Id: Id699a60afe02f05eb6732de7529d18517c2e86f8