am 1fbcb317: am 599d4882: Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev

* commit '1fbcb3173b579b23357823b0f040a49121395d99':
  SurfaceTexture: Fix a fence fd leak.