am 5fd8f5c2: am 8a9d3977: Merge "Add missing header necessary for libc++."

* commit '5fd8f5c2ec559a8bf2f37ee9cc6c7b603ba43a7a':
  Add missing header necessary for libc++.