Merge "Support Mockito in art buildbot tests"