Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev