Merge "Use junit-host instead of junit" am: 2d517a9a69 am: 021427812f am: 9331e6a1c8
am: 797e01c269

Change-Id: I641dec6b9c9705d6edec2778991a45c252dc0e80