Sync with internal changes.

Change-Id: I4db1e38597dcd76acefe89e2eb28cc5bae16178e
diff --git a/dev/BUILD b/dev/BUILD
index 0ca17f3..4df9de8 100644
--- a/dev/BUILD
+++ b/dev/BUILD
@@ -137,6 +137,11 @@
         ["core/src/**/*.java"],
         exclude = ["**/package-info.java"],
     ),
+    # Temporary workaround to ensure Java 6 compatible class files after Java
+    # 7 upgrade.
+    # TODO: only the requestfactory client should be required to be Android
+    # compatible.
+    constraints = ["android"],
     deps = [
         ":compiler.standalone.super",
         "//third_party/java_src/gwt/svn/tools:dev_deps",
@@ -215,6 +220,7 @@
             "**/package-info.java",
         ],
     ),
+    constraints = ["android"],
     javacopts = [
         "-encoding utf8",
         "-source 5",