am a425ebce: Merge "Fix a STLport-related crash."

* commit 'a425ebceb7d24785e46f77e8e5464e7e50f45cca':
  Fix a STLport-related crash.