am 7c931e2e: (-s ours) am f4eaaadb: Merge "Fix use of %llx for sscanf 64 bit values."

* commit '7c931e2e4b3e9bea0f4d9b942e28864adfe00887':
  Fix use of %llx for sscanf 64 bit values.