Merge "Fix building with iOS 9 beta SDK"