Merge "Move remaining jobject related functions to use ObjPtr"
am: 81ca05d930

Change-Id: Ic7e25af0f020ab4d0a33aa9b06596602ed428908