am 6c59af60: Merge "Fix compilation issue for 64bit"

* commit '6c59af6011c9ba9892fb94bd0df8147cf2c0ec12':
  Fix compilation issue for 64bit