Merge SP1A.210425.001

Change-Id: If71c56f3e2e9fbbeffc7096a560a5ef8b8cd8566

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/cfi_test.cpp b/tests/cfi_test.cpp
index d3cd8d1b8..9a6ed9ac6 100644
--- a/tests/cfi_test.cpp
+++ b/tests/cfi_test.cpp
@@ -15,12 +15,13 @@
  */
 
 #include <dlfcn.h>
-#include <gtest/gtest.h>
 #include <sys/stat.h>
 
 #include <vector>
 
-#include "BionicDeathTest.h"
+#include <android-base/silent_death_test.h>
+#include <gtest/gtest.h>
+
 #include "gtest_globals.h"
 #include "utils.h"
 
@@ -35,7 +36,7 @@ void __cfi_slowpath_diag(uint64_t CallSiteTypeId, void* Ptr, void* DiagData);
 size_t __cfi_shadow_size();
 }
 
-using cfi_test_DeathTest = BionicDeathTest;
+using cfi_test_DeathTest = SilentDeathTest;
 
 static void f() {}