Merge "Minor fixes to SurfaceTexture transform matrix."