am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"

* commit '9ce69a5f9fc1e5e4efb19b708c9aa91cfd0969db':
  Make sure __u64 is defined even for strict ansi or -std=c99