Merge "Fix x86 build, remove void* arithmetic."