am f18429e3: Merge "Fix _STLP_USE_EXCEPTIONS"

* commit 'f18429e3d6bf0d955f66160644de0672f045872a':
  Fix _STLP_USE_EXCEPTIONS