Revert^3 "mockito: remove opentest4j dependency"

68d5d328913d63910b6d17644159b68d62258cbc

Change-Id: I9b585f21ce5472d20d32a502dd317b67ece62b5f
2 files changed