Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev