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

Change-Id: I73a7adfa2a049caa91470ca59d91158523ec7851