am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
  Fix RenderScriptGL setSurfaceTexture problem