Revert "Revert "Fix builds with XCode 8 / OSX SDK 10.12"" am: 7f89d64f89
am: 0c14107418

Change-Id: I5399986c02be8cef600b6a8ace2730ab34956ff2