am 9417a80e: Merge "Always define the 64-bit int types."

* commit '9417a80e48d3bba4bea814178aaa79b905ebab8c':
  Always define the 64-bit int types.