64-bit OS X build fix

Change-Id: Icf344f3ad4d508bb47500db3bc5cfb5ee642acfa