Merge "Refactor Class::FixupNativePointers()."