Remove references to devil_arm.gni.

Bug: 887888
Change-Id: I51557e114a1385e75476bae20dd8843c383c1b26
Reviewed-on: https://chromium-review.googlesource.com/1253103
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595722}

build/config/arm.gni

@@ -4,10 +4,6 @@
 
 import("//build/config/v8_target_cpu.gni")
 
-if (target_os == "android") {
-  import("//third_party/catapult/devil/devil_arm.gni")
-}
-
 # These are primarily relevant in current_cpu == "arm" contexts, where
 # ARM code is being compiled.  But they can also be relevant in the
 # other contexts when the code will change its behavior based on the
@@ -83,15 +79,8 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
     }
 
     if (arm_float_abi == "") {
-      if (current_os == "android") {
+      if (current_os == "android" || target_os == "android") {
         arm_float_abi = "softfp"
-      } else if (target_os == "android") {
-        if (build_devil_arm_deps) {
-          # Raspberry Pis require "hard"
-          arm_float_abi = "hard"
-        } else {
-          arm_float_abi = "softfp"
-        }
       } else if (current_os == "linux" && target_cpu != v8_target_cpu) {
         # Default to the same as Android for V8 simulator builds.
         arm_float_abi = "softfp"