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

Change-Id: I8a0fa5a09032d5dc701f294df3ceaff6751e095c