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

* commit '7fe8229b49ea091d769b63052247ca12280975eb':
  Avoid changing the C++ ABI with ssize_t.