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

Change-Id: Ib5e45910e05e7af6f6777b9ceebaf1c80ee66fea