Merge commit '64162b5dcc1c' from apple/stable/20210107 into swift/release/5.5

Author: git apple-llvm automerger

compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py

@@ -7,7 +7,14 @@
 if not device_id:
   raise EnvironmentError("Specify SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER to select which simulator to use.")
 
-for e in ["ASAN_OPTIONS", "TSAN_OPTIONS", "UBSAN_OPTIONS", "APPLE_ASAN_INIT_FOR_DLOPEN", "ASAN_ACTIVATION_OPTIONS"]:
+for e in [
+  "ASAN_OPTIONS",
+  "TSAN_OPTIONS",
+  "UBSAN_OPTIONS",
+  "APPLE_ASAN_INIT_FOR_DLOPEN",
+  "ASAN_ACTIVATION_OPTIONS",
+  "MallocNanoZone",
+]:
   if e in os.environ:
     os.environ["SIMCTL_CHILD_" + e] = os.environ[e]