Use junit-host instead of junit am: e519dd3b14
am: 997bbb52aa

Change-Id: I518ef4b654da108ec93359145d2aef7bddb91dc7