Merge "Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener"