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

Change-Id: I2365d6d5f6f93f681cf1277df8356452b0c0f0f3