Merge "Remove unreachable JNI workaround code."