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

Change-Id: I436a6bd43e99d1d8cfd1b748687f268ca60121af