Merge "Refactor Class::FixupNativePointers()."
am: 9b1e90ef5c

Change-Id: Ie33f2bab45656a9d51b74cef82697acbec9e189a