DO NOT MERGE clean up old layouts

cherry-pick of https://googleplex-android-review.googlesource.com/297316

Bug: 8393227
Change-Id: Ida8efbc4634f3897e4974409fce7f81d8c2bda82
15 files changed