Merge "Fix build warning for void * arithmetic"