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