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