am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"

* commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265':
  Don't assume that size_t is 32-bit