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

Change-Id: Ia9554a45d4ca7ee49e196005862a81a3b2b56cbf