Merge "Revert "Fix _STLP_USE_EXCEPTIONS""