clean up old layouts, pt 3

Bug: 8393227
Change-Id: I8fbd3ed96d9f7e10708ff6b064b2fea4865c4f69
2 files changed