Merge "Fix SurfaceTexture transform matrix." into honeycomb