Fix builds with XCode 8 / OSX SDK 10.12 am: fb6424b551 am: 3417330618 am: 565c14bef7
am: fe795e3400

Change-Id: I0ca60754128ef0763c84c8091ba4db466e4f2304