back to plain arm for the night

It's looking like the previous CL did not fix the Daisy bot GMs,
even though that's still the only bit of code I can find that was
ignoring color order.  Puzzled.  Reverting arm_version=7 for now.

BUG=skia:1843

Review URL: https://codereview.chromium.org/1051423002
diff --git a/platform_tools/chromeos/bin/chromeos_setup.sh b/platform_tools/chromeos/bin/chromeos_setup.sh
index 721d7d6..de4d6f9 100755
--- a/platform_tools/chromeos/bin/chromeos_setup.sh
+++ b/platform_tools/chromeos/bin/chromeos_setup.sh
@@ -34,8 +34,8 @@
         GENERIC_BOARD_TYPE="amd64-generic"
         ;;
     daisy)
-        # TODO(mtklein): make this arm_neon=1
-        DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=0"
+        # TODO(mtklein): make this arm_version=7 arm_neon=1
+        DEFINES="${DEFINES} skia_arch_type=arm"
         # TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm
         # build, which throws lots of "mangling of va_list has changed" warnings.
         DEFINES="${DEFINES} skia_warnings_as_errors=0"