Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I659e7530cc9390373156ae64189babfaca3bde11
tree: c8b0a1d7846ddbf320ec283440a8bc11273b735d
  1. src/
  2. .gitignore
  3. BUILD
  4. LICENSE