Merge "Fix Skia's impl for TextureView.getBitmap" into pi-dev