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

* commit '2651d6c6cbd0fafff83aafb61ab7bc9cbab413d2':
  Always define the 64-bit int types.