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

Change-Id: Id6e08ef783f9f6c01825b42e7fd779d843aba5d6