Merge "Move default native bridge value to build.prop" am: e7a0516835
am: 77492a72a2

Change-Id: I40565e0df3718cb326b810a59372e4ebdaeeadf7