am c6f93a43: Merge "Add missing include to fix libc++ build."

* commit 'c6f93a43d636b0ad16b75adf664c6a33d30b39dd':
  Add missing include to fix libc++ build.