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

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

Change-Id: I84e6000821c9fb024f295c3c8961d9ff8fbdc016