am c1087e55: am bf6c2dbe: Merge "Fix mac build."

* commit 'c1087e55c63f2c206eae676fd4c237585a64e8e5':
  Fix mac build.