Merge "Fix mac build for nativebridge tests."