Merge "Fix misspelling in SurfaceTexture#attachToGLContext javadoc"