Merge "More incorrect screenshot JNI code."