ObjPtr<>-ify method/var handles, fix stale refs in tests. am: 5aead70021 am: 31484432e5
am: 242eaee07c

Change-Id: I2a1724d32b2c276dd97c107fdc1900f10a7f7fbb