Merge "Fix build on XCode 8 w/OSX 10.12 SDK"
am: 97b0cfaf63

Change-Id: Ic43a82df0d355eef9bf5122497d8b7c5ee0ad7fb