Merge "Use junit-host instead of junit" am: 90aa779717
am: 07310f8ceb

Change-Id: Ic6f3dc1edf68d97543ade6e6e05dcbfee10b74e1