Include stdint.h for uint64_t. Also remove a redundant return at the
end of a function.

Bug: None
Test: make
Change-Id: I7712bd8020bc063463f5fee09fa05439b462cfac