Merge "Fix invalid JNI call signature. Bug: 5029536"