Merge "Fix MacOS SDK build error caused by deprecated stl call."