Merge "Move AssetAtlas off of SkBitmap*"