Merge "[GWP-ASan] [heapprofd] Fix infinite recursion between malloc-racing threads." am: 0d303b42b5

Change-Id: I99b2dcb85dd7798f38319af16eefb7a31ae1bc39