Merge "Use junit-host instead of junit"
am: 75e4a422ec

Change-Id: I1d0b87ac34613f739e24d3a8ff13798778b89117