Merge "Update path to mockito"