Merge "Follow renames of hamcrest-host and junit-host"