am 8e3465d8: Merge "Fix 64bit build."

* commit '8e3465d8da8133e5fe9bf79a3b8ec344cf4d423d':
  Fix 64bit build.