Merge "Merge "Trace heap size for allocations" am: 9ffcfa5fad" into stage-aosp-master
am: 65bd31aad3

Change-Id: Ia02ca86735391bf061895c421a5400f5588319a4