Merge "Properly refer to Java "long" as "jlong""