Fix building on darwin-x86_64 with clang

Change-Id: I258a707662f90777a4e7c2555f9ba9ee9106fa26
2 files changed