diff --git a/build/Android.bp b/build/Android.bp
index be7dafd..ed9f308 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -150,9 +150,19 @@
         "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
         "-DVIXL_DEBUG",
         "-UNDEBUG",
-        "-Wno-frame-larger-than=",
     ],
     asflags: [
         "-UNDEBUG",
     ],
+    target: {
+        // This has to be duplicated for android and host to make sure it
+        // comes after the -Wframe-larger-than warnings inserted by art.go
+        // target-specific properties
+        android: {
+            cflags: ["-Wno-frame-larger-than="],
+        },
+        host: {
+            cflags: ["-Wno-frame-larger-than="],
+        },
+    },
 }
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 289adf8..0143268 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -245,8 +245,8 @@
 art_cc_library {
     name: "libartd-compiler",
     defaults: [
-        "libart-compiler-defaults",
         "art_debug_defaults",
+        "libart-compiler-defaults",
     ],
     codegen: {
         arm: {
diff --git a/runtime/Android.bp b/runtime/Android.bp
index c92df4e..ac65d89 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -449,8 +449,8 @@
 art_cc_library {
     name: "libartd",
     defaults: [
-        "libart_defaults",
-        "art_debug_defaults",
+       "art_debug_defaults",
+       "libart_defaults",
     ],
 }
 
diff --git a/runtime/openjdkjvm/Android.bp b/runtime/openjdkjvm/Android.bp
index 3e8dc8c..5ed1615 100644
--- a/runtime/openjdkjvm/Android.bp
+++ b/runtime/openjdkjvm/Android.bp
@@ -31,8 +31,8 @@
 art_cc_library {
     name: "libopenjdkjvmd",
     defaults: [
-        "libopenjdkjvm_defaults",
         "art_debug_defaults",
+        "libopenjdkjvm_defaults",
     ],
     shared_libs: ["libartd"],
 }
diff --git a/runtime/openjdkjvmti/Android.bp b/runtime/openjdkjvmti/Android.bp
index 4430248..977ef44 100644
--- a/runtime/openjdkjvmti/Android.bp
+++ b/runtime/openjdkjvmti/Android.bp
@@ -31,8 +31,8 @@
 art_cc_library {
     name: "libopenjdkjvmtid",
     defaults: [
-        "libopenjdkjvmti_defaults",
         "art_debug_defaults",
+        "libopenjdkjvmti_defaults",
     ],
     shared_libs: ["libartd"],
 }
diff --git a/runtime/simulator/Android.bp b/runtime/simulator/Android.bp
index 05f44e3..2a49e7e 100644
--- a/runtime/simulator/Android.bp
+++ b/runtime/simulator/Android.bp
@@ -41,8 +41,8 @@
 cc_library_host_shared {
     name: "libart-simulatord",
     defaults: [
-        "libart_simulator_defaults",
         "art_debug_defaults",
+        "libart_simulator_defaults",
     ],
     shared_libs: [
         "libartd",