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