Merge "Update file_descriptor_jni.h and related symbols"