am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-dev

* commit '60c5b714dc747eef0b5c2a57db60b162315fba2f':
  Crash in SurfaceTextureTarget filter open