am 777a4ee6: Merge "Fix 32-bit build."

* commit '777a4ee6771e6fe3362ef4f24244a44fcd0aabe4':
  Fix 32-bit build.