Use junit-host instead of junit
am: 361540cfc3

Change-Id: I7d303578038105b437b12fbcc1e820a645272b61