Buildify all the build files

We are slowly upgrading them all.  Bite bullet and do the rest of them.

Change-Id: I15744cf1b0dc1954954e131b35228c98247c92fe
diff --git a/third_party/protobuf/BUILD b/third_party/protobuf/BUILD
index ea13eed..9b5c4ff 100644
--- a/third_party/protobuf/BUILD
+++ b/third_party/protobuf/BUILD
@@ -44,12 +44,12 @@
 
 load(
     ":protobuf.bzl",
+    "COPTS",
     "cc_proto_library",
-    "py_proto_library",
     "internal_copied_filegroup",
     "internal_gen_well_known_protos_java",
     "internal_protobuf_py_tests",
-    "COPTS",
+    "py_proto_library",
 )
 
 cc_library(
diff --git a/third_party/protobuf/six.BUILD b/third_party/protobuf/six.BUILD
index fb0b360..b18cd78 100644
--- a/third_party/protobuf/six.BUILD
+++ b/third_party/protobuf/six.BUILD
@@ -1,13 +1,13 @@
 genrule(
-  name = "copy_six",
-  srcs = ["six-1.10.0/six.py"],
-  outs = ["six.py"],
-  cmd = "cp $< $(@)",
+    name = "copy_six",
+    srcs = ["six-1.10.0/six.py"],
+    outs = ["six.py"],
+    cmd = "cp $< $(@)",
 )
 
 py_library(
-  name = "six",
-  srcs = ["six.py"],
-  srcs_version = "PY2AND3",
-  visibility = ["//visibility:public"],
+    name = "six",
+    srcs = ["six.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
 )