Merge "Fix GC memory overhead accounting."