Merge "Fix clang build breakage ("arithmetic on a pointer to void")."