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

* commit '6326c00d0206627b63fe7b70e4f43a9b95d8d065':
  Fix 64 bit builds.