Merge "Move Mockito to static library section of core-tests" am: 622c75906d am: b8ce3fd29d
am: ddf9ed53d5

Change-Id: Ide20d03b27705ba1b2347ee5ae00cde533fc8832