Merge "enable fuzzing trusty targets automatically" am: d5bd5437b0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1625099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0757c4d80abc3137e9eba5e2dd074f3d19c9605e

trusty/fuzz/Android.bp

@@ -30,7 +30,6 @@ cc_defaults {
         "-Werror",
     ],
     fuzz_config: {
-        fuzz_on_haiku_device: false,
         fuzz_on_haiku_host: false,
     },
 }

trusty/fuzz/test/Android.bp

@@ -24,5 +24,8 @@ cc_fuzz {
         "-DTRUSTY_APP_PORT=\"com.android.trusty.sancov.test.srv\"",
         "-DTRUSTY_APP_UUID=\"77f68803-c514-43ba-bdce-3254531c3d24\"",
         "-DTRUSTY_APP_FILENAME=\"srv.syms.elf\"",
-    ]
+    ],
+    fuzz_config: {
+        fuzz_on_haiku_device: false,
+    },
 }