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

Change-Id: I9d2daffeda24beb1e4d1f7edd8dc0f4ae166cee2