Make build time work on Mac OS x

Change-Id: I794b30c56ddd7c2c0fc803e8e4542e52b794e95b