am 9e57d478: am b67a3c27: Merge "Fix GCC 4.9 complaint about int/size_t mismatch."

* commit '9e57d478ec1d484f811e320300bb2a69dd615f4b':
  Fix GCC 4.9 complaint about int/size_t mismatch.