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

* commit '4bae6149bd419eac00e5782a30d19463957e3c42':
  Crash in SurfaceTextureTarget filter open