Fix mac build.

Test: Builds on mac/linux.
Test: Ran unit tests on mac/linux.
Change-Id: Ie89c2d8ac52a4df42e63ae0968f672482d2730f6
2 files changed