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

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