Use junit-host instead of junit
am: e519dd3b14

Change-Id: I1f7a3445aaf9e6e8a692160769eaa53680c15e86