Tidy up search ripples/layout.

+ Make search/overflow ripples borderless
- Simplify some layouts.

The search bar as a whole still doesn't have a ripple, but that's
not a change from existing behavior.

Change-Id: I40c52d3257cc33002786d3d31fb1e162e5a5e171