By also removing their obsolete layout referents. Bug:10344949 Change-Id: Iff8bf686507c63239f058de82ebc776d27480b4f