Merge "Required 64bit changes for JNI/Java for RS compat lib."