Merge "Use junit-host instead of junit"