Merge "Fix RenderScriptGL setSurfaceTexture problem"