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

* commit 'dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':