Merge "Fix iphonesimulator and armv6-darwin build targets."