Merge "Don't account buffer.arrayOffset() twice."