Merge "Add mockito-inline for host tests" am: e64ea0b85e am: 2f4a87c5c2
am: 3fb6123bd1

Change-Id: Idd26b2685f681dab1274b171cc6b9b3d3d73acec