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

Change-Id: I9ff4bf7f8884220e3644a9cea3404c1dce702019