Merge b217b0342962100d80ac5e44a7049fbfeefa06f1 on remote branch

Change-Id: Ifd094c5bbe22d9a45ca26aa30d88929fd500aa86
diff --git a/ojluni/src/main/native/UNIXProcess_md.c b/ojluni/src/main/native/UNIXProcess_md.c
index 40fdc18..a3790e8 100644
--- a/ojluni/src/main/native/UNIXProcess_md.c
+++ b/ojluni/src/main/native/UNIXProcess_md.c
@@ -119,8 +119,7 @@
 #ifndef START_CHILD_USE_VFORK
 // Android-changed: disable vfork under AddressSanitizer.
 //  #ifdef __linux__
-  #if defined(__linux__) && !__has_feature(address_sanitizer) && \
-      !__has_feature(hwaddress_sanitizer)
+  #if defined(__linux__) && !__has_feature(address_sanitizer)
     #define START_CHILD_USE_VFORK 1
   #else
     #define START_CHILD_USE_VFORK 0