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

Change-Id: I3f1beb714577842dba8d7ec5123ebef9a790a6e0