Merge "Fix pointer arithmetic on a void*"
am: 306b1d9d66

* commit '306b1d9d66ab24149f25133fd595e5cd22884cc5':
  Fix pointer arithmetic on a void*