Change build configuration to match r5079
Merge branch 'master' of github.com:wobbals/webrtc-ios

Conflicts:
	build-ios.sh