am e514639f: am 2a884eef: Merge "Stop disallowing sanitizers."

* commit 'e514639feba9ce77c36b8fee23e893fff8b4be0f':
  Stop disallowing sanitizers.

libs/host/Android.mk

@@ -16,13 +16,12 @@ endif
 
 LOCAL_MODULE:= libhost
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_CXX_STL := none
 
 # acp uses libhost, so we can't use
 # acp to install libhost.
 LOCAL_ACP_UNAVAILABLE:= true
 
-LOCAL_ADDRESS_SANITIZER := false
-
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # Include toolchain prebuilt modules if they exist.

tools/acp/Android.mk

@@ -23,6 +23,5 @@ LOCAL_C_INCLUDES := build/libs/host/include
 LOCAL_MODULE := acp
 LOCAL_ACP_UNAVAILABLE := true
 LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
 
 include $(BUILD_HOST_EXECUTABLE)