am f976082e: Merge "Fix omitted libc includes."

* commit 'f976082eead2b7c19bf8c00d79e4723e6c4eb8e9':
  Fix omitted libc includes.