Merge "Follow renames of hamcrest-host and junit-host" am: 7d750ea029 am: ce5e27d3a7 am: 08e43c95d3
am: 48d5139b46

Change-Id: I3b4f40aea3d4fb948a19341ec029de60d83137b1