Merge "Fix SkBitmap::fPixels not being locked correctly"