Merge "Fix Skia's impl for TextureView.getBitmap" into pi-dev am: 5d27097739
am: 6eb88411e6

Change-Id: I04f782a456997f6946a1ea258dea964ffd1b59f2