Merge "Fix pointer casts incompatible with 64 bit architectures" into tizen