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

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

Change-Id: I4d8e20a48f924388e021fcb0c4e186987012c5d1