Merge "Trace heap size for allocations" am: 9ffcfa5fad
am: 668110c7ff

Change-Id: I33e3daa64bd50824f47176a94bba05e5b2ed5d30