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

Change-Id: Ia3b759c9e99498e50f67c7d6bfa04fe9fa4eab93