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

Change-Id: I8cacafcc321253911e23967c9ebd5dfab1bd06ae