Merge "Use junit-host instead of junit" am: 06c7276db4 am: 189889b554
am: 445c41ff48

Change-Id: Ifaa9e7e5bc7ac1dc8cfe4d488670ee1b4dabe1de