Merge "Revert^2 "Add CodeInfo to JNI methods.""