Merge "Use junit-host instead of junit" am: 7dda7e1e81
am: bbb501281e

Change-Id: I4b4260849b69c2ce103b9ca2c37ec412892ccde0