Remove unneeded layouts.

Change-Id: I46fdb4ed07f67c749f0a7e62c7d9a657aa8e44e3
9 files changed