Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Upgrade javamelody-core to 1.87.0
  Upgrade bazlets to latest stable-3.1 to build with 3.1.12 API
  Upgrade bazlets to latest stable-3.1 to build with 3.1.11 API

Change-Id: I03e380865685a63d4f5ee606c29ccfb4aefe2d98