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

Change-Id: I2576d681111d3e23fe7992473893cb53d7e90b15