Merge "Remove calls to deprecated SkBitmap::setIsOpaque()"