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

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