Merge "Revert "Remove Bitmap#getSkBitmap""