Merge "Use junit-host instead of junit" am: eafda48599
am: 4d0a75dc75

Change-Id: I27ca922115b308935d6f6482c34099496cdfd9a0