Backed out changeset 9353a526c194 (bug 1366049) for bustage in /python/mozbuild/mozbuild/test/configure/lint.py r=backout on a CLOSED TREE

mobile/android/config/mozconfigs/common

@@ -8,7 +8,10 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
 fi
 
 if [ -z "$NO_NDK" ]; then
-  . "$topsrcdir/build/mozconfig.stylo"
+  # MOZ_UPDATE_CHANNEL isn't always set.  It cannot use to detect as trunk.
+  if [ `tail -1 "$topsrcdir/config/milestone.txt" | grep 'a1'` ] ; then
+    . "$topsrcdir/build/mozconfig.stylo"
+  fi
 fi
 
 MOZ_AUTOMATION_L10N_CHECK=0

toolkit/moz.configure

@@ -574,8 +574,14 @@ def stylo_config(value, _, target, milestone):
     # If nothing is specified, default to building and enabling Stylo where it
     # is known to work.
     if value.origin == 'default':
-        build_stylo = True
-        enable_stylo = True
+        # Build stylo on Android Nighly, but this is still turned off yet.
+        if target.os == 'Android':
+            if milestone.is_nightly:
+                build_stylo = True
+                enable_stylo = None
+        else:
+            build_stylo = True
+            enable_stylo = True
     elif len(value) and value[0] == 'build':
         # Build but disable by request.
         build_stylo = True