am d736b8d6: Merge "Fix some more missing libc includes."

* commit 'd736b8d6b3f95b7af19b75a613486b023279c3ee':
  Fix some more missing libc includes.