Merge "Correct for 115-native-bridge hard-coded x86/x86_64 signal handling values"