Merge "Disable 115-native-bridge in Makefile."