Merge "Use junit-host instead of junit"
am: 2d517a9a69

Change-Id: Id6e4a900169a73f32ce87464b96afb69f0cdc87e