(cherry picked from commit da5651fbb9)
da5651fbb9
Also removed the obsolete iOS xcode template. (cherry picked from commit 3efe1231f0)
3efe1231f0