Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev

* changes:
  SurfaceTexture: fix an out of bounds array access
  surfaceflinger: refactor FrambufferSurface