Merge branch 'stable-2.15'

* stable-2.15:
  Update mockito-core to 2.24.0
  Upgrade bazlets to latest stable-2.15 to build with 2.15.9 API

Change-Id: I4db68b1327c9bbcb748f91a016bab7866353775d