Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.7 API
  Upgrade bazlets to latest stable-3.0 to build with 3.0.11 API
  Remove the commented-out snapshot plugin api lines

Change-Id: Ia4e22cb35b1973feec358bdc75162e2d76f8abf9
diff --git a/WORKSPACE b/WORKSPACE
index e755949..3bc41e8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -12,8 +12,4 @@
     "gerrit_api",
 )
 
-# Load release Plugin API
 gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api(version = "3.3.0-SNAPSHOT")