diff --git a/Android.bp b/Android.bp
index 19c7a9a..4193306 100644
--- a/Android.bp
+++ b/Android.bp
@@ -346,24 +346,29 @@
             ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"],
         },
         android_arm64: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_mips: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_mips64: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_x86: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_x86_64: {
             srcs: ["lib/builtins/ppc/floatditf.c"],
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         linux: {
diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk
index 96349ee..f4aefcd 100644
--- a/lib/asan/Android.mk
+++ b/lib/asan/Android.mk
@@ -203,7 +203,6 @@
 LOCAL_MODULE := libasan_noinst_test
 LOCAL_MODULE_TAGS := tests
 LOCAL_C_INCLUDES := \
-    external/gtest/include \
     external/compiler-rt/include \
     external/compiler-rt/lib \
     external/compiler-rt/lib/asan/tests \
@@ -224,7 +223,7 @@
 LOCAL_MODULE_TARGET_ARCH := arm arm64 x86
 LOCAL_CXX_STL := libc++
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_STATIC_TEST_LIBRARY)
 
 
 include $(CLEAR_VARS)
@@ -232,21 +231,20 @@
 LOCAL_MODULE := asan_test
 LOCAL_MODULE_TAGS := tests
 LOCAL_C_INCLUDES := \
-    external/gtest/include \
     external/compiler-rt/lib \
     external/compiler-rt/lib/asan/tests \
     external/compiler-rt/lib/sanitizer_common/tests
 LOCAL_CFLAGS += $(asan_test_cflags)
 LOCAL_SRC_FILES := $(asan_test_files)
 LOCAL_CPP_EXTENSION := .cc
-LOCAL_STATIC_LIBRARIES := libgtest libasan_noinst_test
+LOCAL_STATIC_LIBRARIES := libasan_noinst_test
 LOCAL_SHARED_LIBRARIES := libc
 LOCAL_SANITIZE := address
 LOCAL_CLANG := true
 LOCAL_MODULE_TARGET_ARCH := arm arm64 x86
 LOCAL_CXX_STL := libc++
 
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_TEST)
 
 endif # SKIP_LLVM_TESTS
 
@@ -283,7 +281,6 @@
 LOCAL_MODULE := libasan_noinst_test
 LOCAL_MODULE_TAGS := tests
 LOCAL_C_INCLUDES := \
-    external/gtest/include \
     external/compiler-rt/include \
     external/compiler-rt/lib \
     external/compiler-rt/lib/asan/tests \
@@ -302,7 +299,7 @@
 LOCAL_CXX_STL := libc++
 LOCAL_MULTILIB := both
 LOCAL_SANITIZE := never
-include $(BUILD_HOST_STATIC_LIBRARY)
+include $(BUILD_HOST_STATIC_TEST_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := asan_test