Fix mac build

I accidentally dropped the hunks that disabled the mac build when
rebasing.

Change-Id: I412325f71c4bfde7a357b50daeb966e6db32c388
1 file changed