Merge "Remove ObjPtr from CalculateNewObjectOffsets"
am: 26d4df2487

Change-Id: Idb55146565675f2d8256acb6c47733f417c1faa7