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

* commit '68c19686e8f9b5a88e3b2729a453d03516be79f1':
  Fix mac build for nativebridge tests.