Internal cleanup CL

This CL fixed a build warning:
nothing matches overlay file view_pager_tab_background.xml, for flavor v21

And it doesn't affect the look of Dialer and Contacts on LMP+.

Bug 27929147
Bug 25629359

Change-Id: I3a71957539b52339921a02c7421244f59018e5f9