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

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