Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191
am: 17a53d5e94

Change-Id: I0592babdb41bcb9ee4110c3b6ba67787699d0959