resolve merge conflicts of ff3341b to stage-aosp-master

am: e6350dfddd

Change-Id: If8afcbb7b2734866b1e0ed26760c1cc1fe235634

core/clear_vars.mk

@@ -194,6 +194,7 @@ LOCAL_DPI_VARIANTS:=
 LOCAL_DPI_FILE_STEM:=
 LOCAL_SANITIZE:=
 LOCAL_SANITIZE_RECOVER:=
+LOCAL_NOSANITIZE:=
 LOCAL_DATA_BINDING:=
 LOCAL_DBUS_PROXY_PREFIX:=
 LOCAL_INIT_RC:=

core/config_sanitizers.mk

@@ -34,6 +34,11 @@ ifeq ($(LOCAL_SANITIZE),never)
   my_sanitize :=
 endif
 
+my_nosanitize = $(strip $(LOCAL_NOSANITIZE))
+ifneq ($(my_nosanitize),)
+  my_sanitize := $(filter-out $(my_nosanitize),$(my_sanitize))
+endif
+
 # TSAN is not supported on 32-bit architectures. For non-multilib cases, make
 # its use an error. For multilib cases, don't use it for the 32-bit case.
 ifneq ($(filter thread,$(my_sanitize)),)