Merge "input jni: don't depend on unique_fd cast to int" into main