Merge "Update file_descriptor_jni.h and related symbols" am: 0fb43439a5 am: 50f3c0dd3c

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1690847

Change-Id: Idba2c015bfb0e894f3947729deeeff884c70ff4b