Remove unneeded views from base layouts am: 505e39ee14

Change-Id: I27113795df808c51bed2d144d6b80806f87f9e9c