Merge "Stop calling SkBitmap::setHasHardwareMipMap"