Move buildifier to buildkite and run buildifier. (#293)

* Move buildifier to buildkite and run buildifier.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index d17bf01..850c806 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -1,4 +1,5 @@
 ---
+buildifier: true
 platforms:
   rbe_ubuntu1604:
     test_targets:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b718e44..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-dist: trusty
-sudo: required
-
-os:
-  - linux
-
-python:
-  - "2.7"
-
-jdk:
-  - oraclejdk8  # Building Bazel requires JDK8.
-
-language: go
-go: 1.10.x
-install: true
-
-services:
-  - docker
-
-addons:
-  apt:
-    sources:
-      - sourceline: 'deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8'
-        key_url: 'https://storage.googleapis.com/bazel-apt/doc/apt-key.pub.gpg'
-    packages:
-      - bazel
-
-install:
-  - go get -u github.com/bazelbuild/buildifier/buildifier
-
-script:
-  # Check that our direct testing passes.
-  # The tests takes long to finish and currently we cover bazel tests in Bazel CI
-  # TODO: add tests cannot be run by bazel here
-  # - bazel clean && bazel test --test_output=errors //...
-
-  # Check for issues with the format of our bazel config files.
-  - buildifier -mode=check $(find . -name BUILD -type f)
-  - buildifier -mode=check $(find . -name WORKSPACE -type f)
-  - buildifier -mode=check $(find . -name '*.bzl' -type f)
diff --git a/README.md b/README.md
index eedabd5..e11d216 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-Travis CI | Bazel CI
-:---: | :---:
-[![Build Status](https://travis-ci.org/bazelbuild/bazel-toolchains.svg?branch=master)](https://travis-ci.org/bazelbuild/bazel-toolchains) | [![Build status](https://badge.buildkite.com/940075452c1c5ff91dc832664c4c8f05e6ec736916688cd894.svg)](https://buildkite.com/bazel/bazel-toolchains-postsubmit)
+Bazel CI
+:---:
+[![Build status](https://badge.buildkite.com/940075452c1c5ff91dc832664c4c8f05e6ec736916688cd894.svg)](https://buildkite.com/bazel/bazel-toolchains-postsubmit)
 
 # bazel-toolchains
 
diff --git a/configs/debian8_clang/0.1.0/bazel_0.5.2/BUILD b/configs/debian8_clang/0.1.0/bazel_0.5.2/BUILD
index ba3bfcd..54648bd 100755
--- a/configs/debian8_clang/0.1.0/bazel_0.5.2/BUILD
+++ b/configs/debian8_clang/0.1.0/bazel_0.5.2/BUILD
@@ -40,9 +40,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.1.0/bazel_0.5.4/BUILD b/configs/debian8_clang/0.1.0/bazel_0.5.4/BUILD
index ba3bfcd..54648bd 100755
--- a/configs/debian8_clang/0.1.0/bazel_0.5.4/BUILD
+++ b/configs/debian8_clang/0.1.0/bazel_0.5.4/BUILD
@@ -40,9 +40,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.1.0/bazel_0.6.0/BUILD b/configs/debian8_clang/0.1.0/bazel_0.6.0/BUILD
index 5f639d1..1ce4fb5 100755
--- a/configs/debian8_clang/0.1.0/bazel_0.6.0/BUILD
+++ b/configs/debian8_clang/0.1.0/bazel_0.6.0/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -40,9 +42,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -102,6 +104,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.2.0/bazel_0.10.0/BUILD b/configs/debian8_clang/0.2.0/bazel_0.10.0/BUILD
index 0efd037..b0883ac 100755
--- a/configs/debian8_clang/0.2.0/bazel_0.10.0/BUILD
+++ b/configs/debian8_clang/0.2.0/bazel_0.10.0/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -113,6 +115,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.2.0/bazel_0.6.0/BUILD b/configs/debian8_clang/0.2.0/bazel_0.6.0/BUILD
index 5f639d1..1ce4fb5 100755
--- a/configs/debian8_clang/0.2.0/bazel_0.6.0/BUILD
+++ b/configs/debian8_clang/0.2.0/bazel_0.6.0/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -40,9 +42,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -102,6 +104,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.2.0/bazel_0.7.0/BUILD b/configs/debian8_clang/0.2.0/bazel_0.7.0/BUILD
index 887cb71..7c73a9a 100755
--- a/configs/debian8_clang/0.2.0/bazel_0.7.0/BUILD
+++ b/configs/debian8_clang/0.2.0/bazel_0.7.0/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -40,9 +42,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -102,6 +104,4 @@
     toolchain_type = ":toolchain_category",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.2.0/bazel_0.8.0/BUILD b/configs/debian8_clang/0.2.0/bazel_0.8.0/BUILD
index 887cb71..7c73a9a 100755
--- a/configs/debian8_clang/0.2.0/bazel_0.8.0/BUILD
+++ b/configs/debian8_clang/0.2.0/bazel_0.8.0/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -40,9 +42,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -102,6 +104,4 @@
     toolchain_type = ":toolchain_category",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.2.0/bazel_0.9.0/BUILD b/configs/debian8_clang/0.2.0/bazel_0.9.0/BUILD
index 946e790..369b0b7 100755
--- a/configs/debian8_clang/0.2.0/bazel_0.9.0/BUILD
+++ b/configs/debian8_clang/0.2.0/bazel_0.9.0/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -40,9 +42,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -110,6 +112,4 @@
     toolchain_type = ":toolchain_category",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.3.0/bazel_0.10.0/BUILD b/configs/debian8_clang/0.3.0/bazel_0.10.0/BUILD
index 0efd037..b0883ac 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.10.0/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.10.0/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -113,6 +115,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.3.0/bazel_0.11.0/msan/BUILD b/configs/debian8_clang/0.3.0/bazel_0.11.0/msan/BUILD
index 6db7164..596caba 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.11.0/msan/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.11.0/msan/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -107,6 +109,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.3.0/bazel_0.12.0/default/BUILD b/configs/debian8_clang/0.3.0/bazel_0.12.0/default/BUILD
index 6db7164..596caba 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.12.0/default/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.12.0/default/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -107,6 +109,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.3.0/bazel_0.12.0/msan/BUILD b/configs/debian8_clang/0.3.0/bazel_0.12.0/msan/BUILD
index 6db7164..596caba 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.12.0/msan/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.12.0/msan/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -107,6 +109,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/debian8_clang/0.3.0/bazel_0.13.0/default/BUILD b/configs/debian8_clang/0.3.0/bazel_0.13.0/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.13.0/default/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.13.0/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.3.0/bazel_0.13.0/msan/BUILD b/configs/debian8_clang/0.3.0/bazel_0.13.0/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.13.0/msan/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.13.0/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.3.0/bazel_0.14.1/default/BUILD b/configs/debian8_clang/0.3.0/bazel_0.14.1/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.14.1/default/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.14.1/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.3.0/bazel_0.14.1/msan/BUILD b/configs/debian8_clang/0.3.0/bazel_0.14.1/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.14.1/msan/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.14.1/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.3.0/bazel_0.15.0/default/BUILD b/configs/debian8_clang/0.3.0/bazel_0.15.0/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.15.0/default/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.15.0/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.3.0/bazel_0.15.0/msan/BUILD b/configs/debian8_clang/0.3.0/bazel_0.15.0/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.15.0/msan/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.15.0/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.3.0/bazel_0.16.1/default/BUILD b/configs/debian8_clang/0.3.0/bazel_0.16.1/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.16.1/default/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.16.1/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.3.0/bazel_0.16.1/msan/BUILD b/configs/debian8_clang/0.3.0/bazel_0.16.1/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.3.0/bazel_0.16.1/msan/BUILD
+++ b/configs/debian8_clang/0.3.0/bazel_0.16.1/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.16.1/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.16.1/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.16.1/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.16.1/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.16.1/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.16.1/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.16.1/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.16.1/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.17.1/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.17.1/default/BUILD
index b521f36..2217d84 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.17.1/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.17.1/default/BUILD
@@ -47,8 +47,8 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.17.1/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.17.1/msan/BUILD
index b521f36..2217d84 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.17.1/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.17.1/msan/BUILD
@@ -47,8 +47,8 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.18.0/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.18.0/default/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.18.0/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.18.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.18.0/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.18.0/msan/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.18.0/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.18.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.19.0/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.19.0/default/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.19.0/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.19.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.19.0/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.19.0/msan/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.19.0/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.19.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.19.2/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.19.2/default/BUILD
index 9acb647..b9ad527 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.19.2/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.19.2/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.19.2/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.19.2/msan/BUILD
index 9acb647..b9ad527 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.19.2/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.19.2/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.20.0/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.20.0/default/BUILD
index 9acb647..b9ad527 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.20.0/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.20.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.20.0/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.20.0/msan/BUILD
index 9acb647..b9ad527 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.20.0/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.20.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.21.0/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.21.0/default/BUILD
index 5a0c52f..2f8b6af 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.21.0/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.21.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.21.0/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.21.0/msan/BUILD
index 5a0c52f..2f8b6af 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.21.0/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.21.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.22.0/default/BUILD b/configs/debian8_clang/0.4.0/bazel_0.22.0/default/BUILD
index 0e2e0ae..4bb10b1 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.22.0/default/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.22.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/0.4.0/bazel_0.22.0/msan/BUILD b/configs/debian8_clang/0.4.0/bazel_0.22.0/msan/BUILD
index 0e2e0ae..4bb10b1 100755
--- a/configs/debian8_clang/0.4.0/bazel_0.22.0/msan/BUILD
+++ b/configs/debian8_clang/0.4.0/bazel_0.22.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/debian8_clang/BUILD b/configs/debian8_clang/BUILD
index 96a5b1d..5892a7a 100644
--- a/configs/debian8_clang/BUILD
+++ b/configs/debian8_clang/BUILD
@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-licenses(["notice"])  # Apache 2.0
-
-package(default_visibility = ["//visibility:public"])
-
+load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_toolchains//rules:docker_config.bzl", "docker_toolchain_autoconfig")
 load(
     "@bazel_toolchains//rules:environments.bzl",
@@ -24,7 +21,10 @@
     "debian8_clang_default_packages",
     "debian8_clang_default_repos",
 )
-load("@bazel_skylib//lib:dicts.bzl", "dicts")
+
+licenses(["notice"])  # Apache 2.0
+
+package(default_visibility = ["//visibility:public"])
 
 # Created on 2017.10.18
 docker_toolchain_autoconfig(
diff --git a/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/msan/BUILD b/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/msan/BUILD
index 3d2434a..5ac85be 100755
--- a/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/msan/BUILD
+++ b/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/msan/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -40,9 +42,9 @@
 cc_toolchain_suite(
     name = "msan_experimental_toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -110,6 +112,4 @@
     toolchain_type = ":toolchain_category",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/ubsan/BUILD b/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/ubsan/BUILD
index dc70b7f..2684b59 100755
--- a/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/ubsan/BUILD
+++ b/configs/experimental/debian8_clang/0.2.0/bazel_0.9.0/ubsan/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -40,9 +42,9 @@
 cc_toolchain_suite(
     name = "ubsan_experimental_toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -110,6 +112,4 @@
     toolchain_type = ":toolchain_category",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/msan/BUILD b/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/msan/BUILD
index 4b7f687..23abd45 100755
--- a/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/msan/BUILD
+++ b/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/msan/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "msan_experimental_toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -113,6 +115,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/ubsan/BUILD b/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/ubsan/BUILD
index 1b56888..a94ef11 100755
--- a/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/ubsan/BUILD
+++ b/configs/experimental/debian8_clang/0.3.0/bazel_0.10.0/ubsan/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "ubsan_experimental_toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -113,6 +115,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/experimental/debian8_clang/0.3.0/bazel_0.12.0/ubsan/BUILD b/configs/experimental/debian8_clang/0.3.0/bazel_0.12.0/ubsan/BUILD
index 6db7164..596caba 100755
--- a/configs/experimental/debian8_clang/0.3.0/bazel_0.12.0/ubsan/BUILD
+++ b/configs/experimental/debian8_clang/0.3.0/bazel_0.12.0/ubsan/BUILD
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load(":dummy_toolchain.bzl", "dummy_toolchain")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
@@ -45,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
@@ -107,6 +109,4 @@
     toolchain_type = ":toolchain_type",
 )
 
-load(":dummy_toolchain.bzl", "dummy_toolchain")
-
 dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.13.0/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.13.0/ubsan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.13.0/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.13.0/ubsan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.14.1/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.14.1/ubsan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.14.1/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.14.1/ubsan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.15.0/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.15.0/ubsan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.15.0/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.0/bazel_0.15.0/ubsan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/BUILD
index b521f36..2217d84 100755
--- a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/BUILD
@@ -47,8 +47,8 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.18.0/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.18.0/ubsan/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.18.0/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.18.0/ubsan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.19.0/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.19.0/ubsan/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.19.0/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.19.0/ubsan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.21.0/ubsan/BUILD b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.21.0/ubsan/BUILD
index 5a0c52f..2f8b6af 100755
--- a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.21.0/ubsan/BUILD
+++ b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.21.0/ubsan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/experimental/windows/0.1.0/bazel_0.19.0/BUILD b/configs/experimental/windows/0.1.0/bazel_0.19.0/BUILD
index df9663c..8d1138f 100644
--- a/configs/experimental/windows/0.1.0/bazel_0.19.0/BUILD
+++ b/configs/experimental/windows/0.1.0/bazel_0.19.0/BUILD
@@ -33,12 +33,12 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
+        "armeabi-v7a": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "x64_windows": ":cc-compiler-x64_windows_msys",
+        "x64_windows|mingw-gcc": ":cc-compiler-x64_windows_mingw",
         "x64_windows|msvc-cl": ":cc-compiler-x64_windows",
         "x64_windows|msys-gcc": ":cc-compiler-x64_windows_msys",
-        "x64_windows|mingw-gcc": ":cc-compiler-x64_windows_mingw",
-        "x64_windows": ":cc-compiler-x64_windows_msys",
-        "armeabi-v7a": ":cc-compiler-armeabi-v7a",
     },
 )
 
diff --git a/configs/experimental/windows/0.1.0/bazel_experimental/BUILD b/configs/experimental/windows/0.1.0/bazel_experimental/BUILD
index d1efd4f..3548c16 100644
--- a/configs/experimental/windows/0.1.0/bazel_experimental/BUILD
+++ b/configs/experimental/windows/0.1.0/bazel_experimental/BUILD
@@ -34,10 +34,10 @@
     name = "toolchain",
     toolchains = {
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "x64_windows|mingw-gcc": ":cc-compiler-x64_windows_mingw",
         "x64_windows|msvc-cl": ":cc-compiler-x64_windows",
         "x64_windows|msys-gcc": ":cc-compiler-x64_windows_msys",
-        "x64_windows|mingw-gcc": ":cc-compiler-x64_windows_mingw",
-        "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/default/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/msan/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.13.0/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/default/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/msan/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.14.1/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/default/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/msan/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.15.0/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/msan/BUILD b/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.0/bazel_0.16.1/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan/BUILD
index 5bba7ae..678239f 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan/BUILD
@@ -47,9 +47,9 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/default/BUILD
index b521f36..2217d84 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/default/BUILD
@@ -47,8 +47,8 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/msan/BUILD
index b521f36..2217d84 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.17.1/msan/BUILD
@@ -47,8 +47,8 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/default/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/msan/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.18.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/default/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/msan/BUILD
index d3b18c6..f43f1d6 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.19.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/default/BUILD
index 9acb647..b9ad527 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/msan/BUILD
index 9acb647..b9ad527 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.19.2/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default/BUILD
index 9acb647..b9ad527 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/msan/BUILD
index 9acb647..b9ad527 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.20.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/default/BUILD
index 5a0c52f..2f8b6af 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/msan/BUILD
index 5a0c52f..2f8b6af 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.21.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/default/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/default/BUILD
index 0e2e0ae..4bb10b1 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/default/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/default/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/msan/BUILD b/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/msan/BUILD
index 0e2e0ae..4bb10b1 100755
--- a/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/msan/BUILD
+++ b/configs/ubuntu16_04_clang/1.1/bazel_0.22.0/msan/BUILD
@@ -47,10 +47,10 @@
 cc_toolchain_suite(
     name = "toolchain",
     toolchains = {
-        "k8|clang": ":cc-compiler-k8",
-        "k8": ":cc-compiler-k8",
-        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "k8": ":cc-compiler-k8",
+        "k8|clang": ":cc-compiler-k8",
     },
 )
 
diff --git a/configs/ubuntu16_04_clang/BUILD b/configs/ubuntu16_04_clang/BUILD
index 065676b..e2bb6d4 100644
--- a/configs/ubuntu16_04_clang/BUILD
+++ b/configs/ubuntu16_04_clang/BUILD
@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-licenses(["notice"])  # Apache 2.0
-
-package(default_visibility = ["//visibility:public"])
-
+load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_toolchains//rules:docker_config.bzl", "docker_toolchain_autoconfig")
 load(
     "@bazel_toolchains//rules:environments.bzl",
@@ -24,7 +21,10 @@
     "ubuntu16_04_clang_default_packages",
     "ubuntu16_04_clang_default_repos",
 )
-load("@bazel_skylib//lib:dicts.bzl", "dicts")
+
+licenses(["notice"])  # Apache 2.0
+
+package(default_visibility = ["//visibility:public"])
 
 # Created on 2018.05.09
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:d553634f23f7c437ca35bbc4b6f1f38bb81be32b9ef2df4329dcd36762277bf7
diff --git a/repositories/BUILD b/repositories/BUILD
index 198e382..5c938e6 100644
--- a/repositories/BUILD
+++ b/repositories/BUILD
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
 licenses(["notice"])  # Apache 2.0
 
 package(default_visibility = ["//visibility:public"])
 
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
 bzl_library(
     name = "images",
     srcs = [
diff --git a/repositories/images.bzl b/repositories/images.bzl
index e944f8c..9f845c5 100644
--- a/repositories/images.bzl
+++ b/repositories/images.bzl
@@ -15,11 +15,11 @@
 # Once recursive workspace is implemented in Bazel, this file should cease
 # to exist.
 
-load("//rules:toolchain_containers.bzl", "toolchain_container_sha256s")
 load(
     "@io_bazel_rules_docker//container:container.bzl",
     "container_pull",
 )
+load("//rules:toolchain_containers.bzl", "toolchain_container_sha256s")
 
 _REGISTRY = "marketplace.gcr.io"
 
diff --git a/rules/BUILD b/rules/BUILD
index 02a04c4..0210bb1 100644
--- a/rules/BUILD
+++ b/rules/BUILD
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+
 licenses(["notice"])  # Apache 2.0
 
 package(default_visibility = ["//visibility:public"])
@@ -21,9 +24,6 @@
     "install_bazel_version.sh",
 ])
 
-load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
 filegroup(
     name = "bazel_installers",
     srcs = [
diff --git a/rules/container/BUILD b/rules/container/BUILD
index 7dc3493..a81e4ba 100644
--- a/rules/container/BUILD
+++ b/rules/container/BUILD
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-licenses(["notice"])  # Apache 2.0
-
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
+licenses(["notice"])  # Apache 2.0
+
 bzl_library(
     name = "debian_pkg_tar",
     srcs = [
diff --git a/rules/container/debian_pkg_tar.bzl b/rules/container/debian_pkg_tar.bzl
index 41db94b..b8bc8b5 100644
--- a/rules/container/debian_pkg_tar.bzl
+++ b/rules/container/debian_pkg_tar.bzl
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@base_images_docker//package_managers:download_pkgs.bzl", _download_deb_pkgs = "download")
 load("@base_images_docker//package_managers:apt_key.bzl", _apt_key = "key")
+load("@base_images_docker//package_managers:download_pkgs.bzl", _download_deb_pkgs = "download")
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 
 def _input_validation(kwargs):
@@ -32,19 +32,19 @@
 
 generate_deb_tar_attrs = dicts.add(_download_deb_pkgs.attrs, {
     "base": attr.label(allow_files = container),
-    "packages": attr.string_list(),
     "keys": attr.label_list(
         allow_files = True,
     ),
+    "packages": attr.string_list(),
 })
 
 aggregate_debian_pkgs_attrs = {
-    "base": attr.label(allow_files = container),
-    "language_layers": attr.label_list(),
 
     # Declare the following attributes since _download_deb_pkgs.implementation
     # need access those attribute if their overrides are None
     "additional_repos": attr.string_list(),
+    "base": attr.label(allow_files = container),
+    "language_layers": attr.label_list(),
     "_image_id_extractor": attr.label(
         default = "@io_bazel_rules_docker//contrib:extract_image_id.py",
         allow_single_file = True,
diff --git a/rules/container/docker_toolchains.bzl b/rules/container/docker_toolchains.bzl
index 75a5beb..59811f9 100644
--- a/rules/container/docker_toolchains.bzl
+++ b/rules/container/docker_toolchains.bzl
@@ -14,11 +14,11 @@
 
 """Definitions of language_tool_layer and toolchain_container rules."""
 
-load("@io_bazel_rules_docker//container:container.bzl", _container = "container")
+load("@base_images_docker//package_managers:apt_key.bzl", _key = "key")
 load("@base_images_docker//package_managers:download_pkgs.bzl", _download = "download")
 load("@base_images_docker//package_managers:install_pkgs.bzl", _install = "install")
-load("@base_images_docker//package_managers:apt_key.bzl", _key = "key")
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
+load("@io_bazel_rules_docker//container:container.bzl", _container = "container")
 load(":debian_pkg_tar.bzl", _generate_deb_tar = "generate")
 
 def _input_validation(kwargs):
@@ -173,21 +173,21 @@
     )
 
 language_tool_layer_attrs = dicts.add(_container.image.attrs, _key.attrs, _download.attrs, _install.attrs, {
+    "image": attr.label(
+        allow_single_file = True,
+    ),
     # Redeclare following attributes as non-mandatory.
     "image_tar": attr.label(
         allow_single_file = True,
     ),
-    "image": attr.label(
-        allow_single_file = True,
-    ),
-    "packages": attr.string_list(),
-    "keys": attr.label_list(
-        allow_files = True,
-    ),
     "installables_tar": attr.label(
         allow_single_file = True,
     ),
+    "keys": attr.label_list(
+        allow_files = True,
+    ),
     "output_image_name": attr.string(),
+    "packages": attr.string_list(),
 })
 
 language_tool_layer_ = rule(
diff --git a/rules/docker_config.bzl b/rules/docker_config.bzl
index 85d272c..b9f3ecf 100644
--- a/rules/docker_config.bzl
+++ b/rules/docker_config.bzl
@@ -118,13 +118,13 @@
  - Rule cannot be placed in the BUILD file at the root of a project
 """
 
+load("@base_images_docker//util:run.bzl", _extract = "extract")
+load("@bazel_skylib//lib:dicts.bzl", "dicts")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
 load(
     "@io_bazel_rules_docker//container:container.bzl",
     _container = "container",
 )
-load("@base_images_docker//util:run.bzl", _extract = "extract")
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
-load("@bazel_skylib//lib:dicts.bzl", "dicts")
 
 # External folder is set to be deprecated, lets keep it here for easy
 # refactoring
@@ -318,21 +318,20 @@
 
 docker_toolchain_autoconfig_ = rule(
     attrs = dicts.add(_container.image.attrs, {
-        "config_repos": attr.string_list(default = ["local_config_cc"]),
-        "mount_project": attr.string(),
-        "use_default_project": attr.bool(default = False),
-        "git_repo": attr.string(),
-        "repo_pkg_tar": attr.label(allow_single_file = tar_filetype),
-        "bazel_version": attr.string(),
-        "bazel_rc_version": attr.string(),
-        "use_bazel_head": attr.bool(default = False),
-        "setup_cmd": attr.string(default = "cd ."),
-        "packages": attr.string_list(),
         "additional_repos": attr.string_list(),
-        "keys": attr.string_list(),
+        "bazel_rc_version": attr.string(),
+        "bazel_version": attr.string(),
+        "config_repos": attr.string_list(default = ["local_config_cc"]),
+        "git_repo": attr.string(),
         "incompatible_changes_off": attr.bool(default = False),
+        "keys": attr.string_list(),
+        "mount_project": attr.string(),
+        "packages": attr.string_list(),
+        "repo_pkg_tar": attr.label(allow_single_file = tar_filetype),
+        "setup_cmd": attr.string(default = "cd ."),
         "test": attr.bool(default = True),
-        "_installers": attr.label(default = ":bazel_installers", allow_files = True),
+        "use_bazel_head": attr.bool(default = False),
+        "use_default_project": attr.bool(default = False),
         # TODO(nlopezgi): fix upstream attr declaration that is missing repo name
         "_extract_tpl": attr.label(
             default = Label("@base_images_docker//util:extract.sh.tpl"),
@@ -342,6 +341,7 @@
             default = "@io_bazel_rules_docker//contrib:extract_image_id.py",
             allow_single_file = True,
         ),
+        "_installers": attr.label(default = ":bazel_installers", allow_files = True),
     }),
     outputs = dicts.add(_container.image.outputs, {
         "log": "%{name}.log",
diff --git a/rules/environments.bzl b/rules/environments.bzl
index c150023..143ba1f 100644
--- a/rules/environments.bzl
+++ b/rules/environments.bzl
@@ -15,27 +15,27 @@
 
 def gcc_env():
     return {
-        "ABI_VERSION": "gcc",
         "ABI_LIBC_VERSION": "glibc_2.19",
+        "ABI_VERSION": "gcc",
         "BAZEL_COMPILER": "gcc",
         "BAZEL_HOST_SYSTEM": "i686-unknown-linux-gnu",
-        "BAZEL_TARGET_LIBC": "glibc_2.19",
         "BAZEL_TARGET_CPU": "k8",
+        "BAZEL_TARGET_LIBC": "glibc_2.19",
         "BAZEL_TARGET_SYSTEM": "x86_64-unknown-linux-gnu",
         "CC_TOOLCHAIN_NAME": "linux_gnu_x86",
     }
 
 def clang_env():
     return {
-        "ABI_VERSION": "clang",
         "ABI_LIBC_VERSION": "glibc_2.19",
+        "ABI_VERSION": "clang",
         "BAZEL_COMPILER": "clang",
         "BAZEL_HOST_SYSTEM": "i686-unknown-linux-gnu",
-        "BAZEL_TARGET_LIBC": "glibc_2.19",
         "BAZEL_TARGET_CPU": "k8",
+        "BAZEL_TARGET_LIBC": "glibc_2.19",
         "BAZEL_TARGET_SYSTEM": "x86_64-unknown-linux-gnu",
-        "CC_TOOLCHAIN_NAME": "linux_gnu_x86",
         "CC": "clang",
+        "CC_TOOLCHAIN_NAME": "linux_gnu_x86",
     }
 
 def debian8_clang_default_packages():
diff --git a/rules/gcs.bzl b/rules/gcs.bzl
index 2d97ea2..d354e0b 100644
--- a/rules/gcs.bzl
+++ b/rules/gcs.bzl
@@ -12,7 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Skylark rule for pulling a file from GCS bucket.
+"""Repository rule for pulling a file from GCS bucket.
+
+The rule uses gsutil tool installed in the system to download a file from a GCS bucket,
+and make it available for other rules to use (e.g. container_image rule).
+To install gsutil, please refer to:
+  https://cloud.google.com/storage/docs/gsutil
+You need to have read access to the GCS bucket.
 """
 
 _GCS_FILE_BUILD = """
@@ -48,8 +54,8 @@
         Label("@bazel_toolchains//rules:gsutil_cp_and_validate.sh.tpl"),
         {
             "%{BUCKET}": ctx.attr.bucket,
-            "%{FILE}": ctx.attr.file,
             "%{DOWNLOAD_PATH}": str(download_path),
+            "%{FILE}": ctx.attr.file,
             "%{SHA256}": ctx.attr.sha256,
         },
     )
@@ -71,23 +77,21 @@
 
 gcs_file = repository_rule(
     attrs = {
-        "bucket": attr.string(mandatory = True),
-        "file": attr.string(mandatory = True),
-        "downloaded_file_path": attr.string(),
-        "sha256": attr.string(mandatory = True),
+        "bucket": attr.string(
+            mandatory = True,
+            doc = "The GCS bucket which contains the file.",
+        ),
+        "downloaded_file_path": attr.string(
+            doc = "Path assigned to the file downloaded.",
+        ),
+        "file": attr.string(
+            mandatory = True,
+            doc = "The file which we are downloading.",
+        ),
+        "sha256": attr.string(
+            mandatory = True,
+            doc = "The expected SHA-256 of the file downloaded.",
+        ),
     },
     implementation = _gcs_file_impl,
 )
-"""Downloads a file from GCS bucket.
-The rule uses gsutil tool installed in the system to download a file from a GCS bucket,
-and make it available for other rules to use (e.g. container_image rule).
-To install gsutil, please refer to:
-  https://cloud.google.com/storage/docs/gsutil
-You need to have read access to the GCS bucket.
-Args:
-  name: Name of the rule.
-  bucket: The GCS bucket which contains the file.
-  file: The file which we are downloading.
-  downloaded_file_path: Path assigned to the file downloaded.
-  sha256: The expected SHA-256 of the file downloaded.
-"""
diff --git a/rules/rbe_repo.bzl b/rules/rbe_repo.bzl
index 1e66111..03dcf59 100644
--- a/rules/rbe_repo.bzl
+++ b/rules/rbe_repo.bzl
@@ -167,10 +167,10 @@
 """
 
 load(
-    "//rules:version_check.bzl",
-    "extract_version_number",
-    "parse_rc",
+    "//configs/ubuntu16_04_clang:versions.bzl",
+    "config_to_bazel_versions",
 )
+load("//rules:environments.bzl", "clang_env")
 load(
     "//rules:toolchain_containers.bzl",
     "RBE_UBUNTU16_04_LATEST",
@@ -178,10 +178,10 @@
     "public_rbe_ubuntu16_04_sha256s",
 )
 load(
-    "//configs/ubuntu16_04_clang:versions.bzl",
-    "config_to_bazel_versions",
+    "//rules:version_check.bzl",
+    "extract_version_number",
+    "parse_rc",
 )
-load("//rules:environments.bzl", "clang_env")
 
 # External folder is set to be deprecated, lets keep it here for easy
 # refactoring
@@ -343,8 +343,8 @@
         _PLATFORM_DIR + "/BUILD",
         template,
         {
-            "%{jdk}": jdk,
             "%{cc-toolchain}": cc_toolchain,
+            "%{jdk}": jdk,
             "%{platform}": platform,
         },
         False,
@@ -517,10 +517,10 @@
         "run_and_extract.sh",
         template,
         {
-            "%{docker_run_flags}": " ".join(docker_run_flags),
             "%{commands}": "/container/run_in_container.sh",
-            "%{image_name}": image_name,
+            "%{docker_run_flags}": " ".join(docker_run_flags),
             "%{extract_file}": "/" + outputs_tar,
+            "%{image_name}": image_name,
             "%{output}": str(ctx.path(".")) + "/output.tar",
         },
         True,
@@ -605,20 +605,27 @@
 # rule directly, use rbe_autoconfig macro declared below.
 _rbe_autoconfig = repository_rule(
     attrs = {
+        "bazel_rc_version": attr.string(
+            doc = ("Optional. An rc version to use. Note an installer for the rc " +
+                   "must be available in https://releases.bazel.build."),
+        ),
         "bazel_version": attr.string(
             default = "local",
             doc = ("The version of Bazel to use to generate toolchain configs." +
                    "Use only (major, minor, patch), e.g., '0.20.0'."),
         ),
-        "bazel_rc_version": attr.string(
-            doc = ("Optional. An rc version to use. Note an installer for the rc " +
-                   "must be available in https://releases.bazel.build."),
-        ),
         "bazel_version_fallback": attr.string(
             default = "0.22.0",
             doc = ("Version to fallback to if not provided explicitly and local " +
                    "is non-release version."),
         ),
+        "config_dir": attr.string(
+            doc = ("Optional. Use only if output_base is defined. If you want to " +
+                   "create multiple toolchain configs (for the same version of Bazel) " +
+                   "you can use this attr to indicate a type of config (e.g., default, " +
+                   "msan). The configs will be generated in a sub-directory when this attr  " +
+                   "is used."),
+        ),
         "digest": attr.string(
             mandatory = True,
             doc = ("The digest (sha256 sum) of the image to pull. For example, " +
@@ -630,6 +637,14 @@
                    "variables that will be set when running the Bazel command to " +
                    "generate the toolchain configs."),
         ),
+        "exec_compatible_with": attr.string_list(
+            default = _RBE_UBUNTU_EXEC_COMPAT_WITH,
+            doc = ("The list of constraints that will be added to the " +
+                   "toolchain in its exec_compatible_with attribute (and to " +
+                   "the platform in its constraint_values attr). For " +
+                   "example, [\"@bazel_tools//platforms:linux\"]. Default " +
+                   " is set to values for rbe-ubuntu16-04 container."),
+        ),
         "incompatible_changes_off": attr.bool(
             default = True,
             doc = ("If set to False the flag --all_incompatible_changes will " +
@@ -646,19 +661,6 @@
             doc = ("Optional. The directory (under the project root) where the " +
                    "produced toolchain configs will be copied to."),
         ),
-        "config_dir": attr.string(
-            doc = ("Optional. Use only if output_base is defined. If you want to " +
-                   "create multiple toolchain configs (for the same version of Bazel) " +
-                   "you can use this attr to indicate a type of config (e.g., default, " +
-                   "msan). The configs will be generated in a sub-directory when this attr  " +
-                   "is used."),
-        ),
-        "setup_cmd": attr.string(
-            default = "cd .",
-            doc = ("Optional. Pass an additional command that will be executed " +
-                   "(inside the container) before running bazel to generate the " +
-                   "toolchain configs"),
-        ),
         "registry": attr.string(
             default = _RBE_UBUNTU_REGISTRY,
             doc = ("The registry to pull the container from. For example, " +
@@ -674,13 +676,11 @@
         "revision": attr.string(
             doc = ("The revision of the rbe-ubuntu16-04 container."),
         ),
-        "exec_compatible_with": attr.string_list(
-            default = _RBE_UBUNTU_EXEC_COMPAT_WITH,
-            doc = ("The list of constraints that will be added to the " +
-                   "toolchain in its exec_compatible_with attribute (and to " +
-                   "the platform in its constraint_values attr). For " +
-                   "example, [\"@bazel_tools//platforms:linux\"]. Default " +
-                   " is set to values for rbe-ubuntu16-04 container."),
+        "setup_cmd": attr.string(
+            default = "cd .",
+            doc = ("Optional. Pass an additional command that will be executed " +
+                   "(inside the container) before running bazel to generate the " +
+                   "toolchain configs"),
         ),
         "target_compatible_with": attr.string_list(
             default = _RBE_UBUNTU_TARGET_COMPAT_WITH,
diff --git a/rules/toolchain_containers.bzl b/rules/toolchain_containers.bzl
index c0cb2d3..231c802 100644
--- a/rules/toolchain_containers.bzl
+++ b/rules/toolchain_containers.bzl
@@ -5,14 +5,14 @@
         ###########################################################
         # gcr.io/cloud-marketplace/google/debian8:latest
         "debian8": "sha256:a6df7738c401aef6bf9c113eb1eea7f3921417fd4711ea28100681f2fe483ea2",
-        # gcr.io/cloud-marketplace/google/ubuntu16_04:latest
-        "ubuntu16_04": "sha256:df51b5c52d71c9867cd9c1c88c81f67a85ff87f1defe7e9b7ac5fb7d652596bf",
 
         ###########################################################
         # Clang images                                            #
         ###########################################################
         # gcr.io/cloud-marketplace/google/clang-debian8
         "debian8_clang": "sha256:e076c87e670f9a3c95e250268f160397d1cee482ec195d51e40b992b34198395",
+        # gcr.io/cloud-marketplace/google/ubuntu16_04:latest
+        "ubuntu16_04": "sha256:df51b5c52d71c9867cd9c1c88c81f67a85ff87f1defe7e9b7ac5fb7d652596bf",
         # gcr.io/cloud-marketplace/google/clang-ubuntu
         "ubuntu16_04_clang": "sha256:9fe84f7c726419ab77a9680887ec4a518d1910a28284c2955620258db01c7aae",
     }
@@ -23,22 +23,22 @@
 
 def public_rbe_ubuntu16_04_sha256s():
     return {
-        "r346485": "sha256:87fe00c5c4d0e64ab3830f743e686716f49569dadb49f1b1b09966c1b36e153c",
-        "r342117": "sha256:f3120a030a19d67626ababdac79cc787e699a1aa924081431285118f87e7b375",
-        "r340178": "sha256:9bd8ba020af33edb5f11eff0af2f63b3bcb168cd6566d7b27c6685e717787928",
-        "r337145": "sha256:b348b2e63253d5e2d32613a349747f07dc82b6b1ecfb69e8c7ac81a653b857c2",
-        "r328903": "sha256:59bf0e191a6b5cc1ab62c2224c810681d1326bad5a27b1d36c9f40113e79da7f",
         "r327695": "sha256:b940d4f08ea79ce9a07220754052da2ac4a4316e035d8799769cea3c24d10c66",
+        "r328903": "sha256:59bf0e191a6b5cc1ab62c2224c810681d1326bad5a27b1d36c9f40113e79da7f",
+        "r337145": "sha256:b348b2e63253d5e2d32613a349747f07dc82b6b1ecfb69e8c7ac81a653b857c2",
+        "r340178": "sha256:9bd8ba020af33edb5f11eff0af2f63b3bcb168cd6566d7b27c6685e717787928",
+        "r342117": "sha256:f3120a030a19d67626ababdac79cc787e699a1aa924081431285118f87e7b375",
+        "r346485": "sha256:87fe00c5c4d0e64ab3830f743e686716f49569dadb49f1b1b09966c1b36e153c",
     }
 
 # Map from revisions of rbe ubuntu16_04 to corresponding major container versions.
 # Kept here as it needs to be updated along with the def above.
 def public_rbe_ubuntu16_04_config_version():
     return {
-        "r346485": "1.1",
-        "r342117": "1.1",
-        "r340178": "1.1",
-        "r337145": "1.0",
-        "r328903": "1.0",
         "r327695": "1.0",
+        "r328903": "1.0",
+        "r337145": "1.0",
+        "r340178": "1.1",
+        "r342117": "1.1",
+        "r346485": "1.1",
     }
diff --git a/tests/config/BUILD b/tests/config/BUILD
index b6fce02..2f8fb2f 100644
--- a/tests/config/BUILD
+++ b/tests/config/BUILD
@@ -12,10 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-licenses(["notice"])  # Apache 2.0
-
-package(default_visibility = ["//visibility:public"])
-
 load("//rules:docker_config.bzl", "docker_toolchain_autoconfig")
 load(
     "//rules:environments.bzl",
@@ -26,6 +22,10 @@
     "gcc_env",
 )
 
+licenses(["notice"])  # Apache 2.0
+
+package(default_visibility = ["//visibility:public"])
+
 bazel_next_release = "0.20.0"
 
 bazel_next_release_rc = "3"
diff --git a/tests/container/BUILD b/tests/container/BUILD
index 3a26384..96efb18 100644
--- a/tests/container/BUILD
+++ b/tests/container/BUILD
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("//rules/container:docker_toolchains.bzl", "toolchain_container")
+
 licenses(["notice"])  # Apache 2.0
 
 package(default_visibility = ["//visibility:public"])
 
-load("//rules/container:docker_toolchains.bzl", "toolchain_container")
-
 # This file contains some sample targets that excersise the container rules
 # We just keep these as examples that should not break (unless indicated)
 # with changes.