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

Change-Id: Ib9f49f1d5dfbc687dd6c3cd5319e69fb82d0a664