Merge commit 'a6e5a4b464be' from llvm.org/main into apple/main

Author: git apple-llvm automerger

compiler-rt/lib/scudo/standalone/tests/common_test.cpp

@@ -43,8 +43,7 @@ TEST(ScudoCommonTest, SKIP_ON_FUCHSIA(ResidentMemorySize)) {
   EXPECT_GT(getResidentMemorySize() - OnStart, Size - Threshold);
 
   releasePagesToOS((uptr)P, 0, Size, &Data);
-  // FIXME: does not work with QEMU-user.
-  // EXPECT_LT(getResidentMemorySize() - OnStart, Threshold);
+  EXPECT_LT(getResidentMemorySize() - OnStart, Threshold);
 
   memset(P, 1, Size);
   EXPECT_GT(getResidentMemorySize() - OnStart, Size - Threshold);