Merge "Don't pull in external/junit through mockito"