fix STL debug build again

Change-Id: Ic616a83adcdf12c64ee3f5a00bf254be847b3c7e