Merge "Use junit-host instead of junit"
am: 8a1869cb38

Change-Id: I2a316a470ad6b810f9972230015210f619dbb321