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

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