Uncomment the working pieces of build_ios.sh
Merge branch 'master' into african-lions