Merge "Enable heapprofd."
am: 46cef1104e

Change-Id: I3348b00f2e872c9cb107d1a583540395ff80cd4d