Merge "Maybe fix #2422586: Native crash in android_os_Parcel_closeFileDescriptor() killed the phone process"