Merge "Revert "Short-term fix for unregistered JNI method""