am 6f6b22e9: Merge "Fix 64 bit builds."

* commit '6f6b22e921d47ab5a6625199f609d2bbfb409061':
  Fix 64 bit builds.