Merge "iOS build configuration updates."