am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests."

* commit 'f0699c11debade875e87efad27d37ddf6fa83ed6':
  Fix mac build for nativebridge tests.