s,IOS_ARCHS,IPHONEOS_ARCHS,
Merge branch 'update' into update.linux