Merge "Follow renames of hamcrest-host and junit-host" am: 7d750ea029
am: ce5e27d3a7

Change-Id: Ideb1520f888ef3851c90ee565b400191675e4e6a