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

Change-Id: Ie9d535b17b8f395b886db9f48b156ccfd23300a9