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