Fix builds with XCode 8 / OSX SDK 10.12
am: fb6424b551

Change-Id: I3cc0f0e9e0a4a88d5e8f6bc28244153a4dfc5755