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

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