am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

* commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b':
  Fix RenderScriptGL setSurfaceTexture problem