Merge "Revert "Add JNI-ids arrays to ClassExt""