Adopt updated mockito

Test: this is a test change
Bug: none
Change-Id: I58b3a2074c74fceeff50727db535e72df6cee293
4 files changed