am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev am: dd447382cd
am: aa768491c3

* commit 'aa768491c3463849df9f3e52ff37e6d9136271af':