Merge "Enable heapprofd." am: 46cef1104e am: 5da807c40c
am: 641b9aa6ec

Change-Id: I71ae83c5e50bad6801aba0415508fe19057c7f0b