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

Change-Id: I76031c7e66a8512a098076314556639505cbcff3