Merge "Use junit-host instead of junit"
am: 06c7276db4

Change-Id: Ie24435c4ee41174c00f5af3127d81779f47b8b5d