Merge "Use junit-host instead of junit" am: 90aa779717 am: 07310f8ceb
am: 5ebd9d045a

Change-Id: Ibf3b49d25a9f0dac1fddb978dd22fc25e1f33770