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

Change-Id: I349a99a8499a28a28a79846f53d1562ea72cf59a