am e15ea72b: Merge "Remove STL references from header files"

* commit 'e15ea72be26441644c21d536f18525702a24d28a':
  Remove STL references from header files