Global cleanup change.

--
PiperOrigin-RevId: 150052200
MOS_MIGRATED_REVID=150052200

src/main/java/com/google/devtools/build/lib/rules/objc/TargetDeviceFamily.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/TargetDeviceFamily.java b/src/main/java/com/google/devtools/build/lib/rules/objc/TargetDeviceFamily.java
index 5074a6e..a9ea744 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/TargetDeviceFamily.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/TargetDeviceFamily.java
@@ -19,10 +19,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -55,14 +53,16 @@
    * Contains the values of the UIDeviceFamily plist info setting for each valid set of
    * TargetDeviceFamilies.
    */
-  public static final Map<Set<TargetDeviceFamily>, List<Integer>> UI_DEVICE_FAMILY_VALUES =
+  public static final ImmutableMap<Set<TargetDeviceFamily>, List<Integer>> UI_DEVICE_FAMILY_VALUES =
       ImmutableMap.<Set<TargetDeviceFamily>, List<Integer>>builder()
           .put(ImmutableSet.of(TargetDeviceFamily.IPHONE), ImmutableList.of(1))
           .put(ImmutableSet.of(TargetDeviceFamily.IPAD), ImmutableList.of(2))
           .put(ImmutableSet.of(TargetDeviceFamily.WATCH), ImmutableList.of(4))
-          .put(ImmutableSet.of(TargetDeviceFamily.IPHONE, TargetDeviceFamily.IPAD),
+          .put(
+              ImmutableSet.of(TargetDeviceFamily.IPHONE, TargetDeviceFamily.IPAD),
               ImmutableList.of(1, 2))
-          .put(ImmutableSet.of(TargetDeviceFamily.IPHONE, TargetDeviceFamily.WATCH),
+          .put(
+              ImmutableSet.of(TargetDeviceFamily.IPHONE, TargetDeviceFamily.WATCH),
               ImmutableList.of(1, 4))
           .build();
 

src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
index c9be71a..c3be4d9 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -76,13 +76,20 @@
     ERROR_OUT,  // Return with an error
   }
   // Keep in sync with options added in OptionProcessor::AddRcfileArgsAndOptions()
-  private static final Set<String> INTERNAL_COMMAND_OPTIONS = ImmutableSet.of(
-      "rc_source", "default_override", "isatty", "terminal_columns", "ignore_client_env",
-      "client_env", "client_cwd");
+  private static final ImmutableSet<String> INTERNAL_COMMAND_OPTIONS =
+      ImmutableSet.of(
+          "rc_source",
+          "default_override",
+          "isatty",
+          "terminal_columns",
+          "ignore_client_env",
+          "client_env",
+          "client_cwd");
 
   private static final ImmutableList<String> HELP_COMMAND = ImmutableList.of("help");
 
-  private static final Set<String> ALL_HELP_OPTIONS = ImmutableSet.of("--help", "-help", "-h");
+  private static final ImmutableSet<String> ALL_HELP_OPTIONS =
+      ImmutableSet.of("--help", "-help", "-h");
 
   /**
    * By throwing this exception, a command indicates that it wants to shutdown