am 9c1912c4: Merge "Avoid changing the C++ ABI with ssize_t."

* commit '9c1912c4bf5eb0edc07bfd333226c4e0b7a629eb':
  Avoid changing the C++ ABI with ssize_t.