Merge "Disable 115-native-bridge in Makefile."
am: ef81e988d0

Change-Id: I7f376daf13eb25d37ec016c5ace0632dcf167f03