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

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