Merge "Remove ObjPtr from CalculateNewObjectOffsets" am: 26d4df2487
am: 5989a20cbb

Change-Id: I5a1f5fb3ad70289de882b52ccf716d702721078f