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