Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I14421b35cec81254f34e3165e988ec079f4dd254
tree: e32445cfe4f29b3de0a7d008ec965ef9a1212ed9
  1. src/
  2. .gitignore
  3. BUILD