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

Change-Id: I8cc071d266f405dd4987c4cc13523e96a2936bd7