am c4cddc7c: Merge "Don\'t account buffer.arrayOffset() twice."

* commit 'c4cddc7cfdd8793ee8bf7d4754917456427ea486':
  Don't account buffer.arrayOffset() twice.