Merge "Remove SkBitmap from ResourceCache" into mnc-dev