Merge "Change dependency to standard mockito-target-minus-junit4"