am 14bd369e: Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev

* commit '14bd369e4b711bfb267279c2161358542ed75b29':
  SurfaceTexture: fix an out of bounds array access
  surfaceflinger: refactor FrambufferSurface