Merge changes from topic 'libutils-remove-string'

* changes:
  storaged: remove usage of String16::std_string
  Add missing includes.