Merge pull request #1040 from cdavis5e/fix-ios-build

Fix iOS/tvOS build.