am 16cfa2e3: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev

* commit '16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3':
  SurfaceTexture: fix an out of bounds array write