Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"
am: 556c9a2f18

Change-Id: I2265df5d6748d385d44b76e5e2b8507432a173f4