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

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