Merge "Fix MacOS SDK build error caused by deprecated stl call." am: ec54ef7a8d am: 40faaebe50
am: 46cf94bf55

Change-Id: I792c68454d4d112a9d44702d991e66475bb5a1cc