Use junit-host instead of junit am: 361540cfc3
am: 3a32e9b252

Change-Id: I770ee141cc42fcb38fb2e339c513e95da5e483a0