Merge branch 'stable-2.16'

* stable-2.16:
  FileBasedWebSessionCacheCleaner: Make CleanupTask a static inner class
  Upgrade bazlets to latest stable-2.14 to build with 2.14.20 API

Change-Id: Idad0ed27096670a3a4dd5c820d4704aafdb159da