Merge changes I070d3a26,Ie9176587

* changes:
  Turn on XOM for libm
  Switch libm to libcrt.builtins
diff --git a/libc/bionic/malloc_heapprofd.cpp b/libc/bionic/malloc_heapprofd.cpp
index c492bac..5129cd7 100644
--- a/libc/bionic/malloc_heapprofd.cpp
+++ b/libc/bionic/malloc_heapprofd.cpp
@@ -202,7 +202,7 @@
   if (__system_property_get(program_property, property_value) == 0) {
     return false;
   }
-  return program_property[0] != '\0';
+  return property_value[0] != '\0';
 }
 
 void HeapprofdInstallSignalHandler() {