Merge "Add two new JNI debugging options."