Merge "copybit: Use proper type casts and pointers"