Merge "Use junit-host instead of junit" am: 6063357ae6
am: 6fc0c5ceca

Change-Id: I107a1e13e3442113c8a92590156ad9362c3a12bb