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

Change-Id: I9263163e34e056468c72102e09e4e111eefda9f8