Merge "Use junit-host instead of junit"
am: 90aa779717

Change-Id: I4c088b5888f203303e90d3f884d4419ed421e51a