Merge "Use junit-host instead of junit" am: 2d517a9a69 am: 021427812f
am: 9331e6a1c8

Change-Id: I9f31a64ea5be7cad8893a0f3d1097e2573b419f6