Merge "Binder: Clean up JNI code"