Merge "Fix vold %lld to PRId64."