Merge "Support Mockito in art buildbot tests"
am: 1f69674a36

Change-Id: If950283797508087df7306e0f6b87bf4d32c90a4