Merge "Fix numerous issues with DdmVmInternal allocation tracking"