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

Change-Id: I8670df5aa87d71851e1ed13727756e2c4918b90e