remove some cruft (code hygiene)

add the clear search button in javascript rather than in html
markup since it requires js to work
Change-Id: I84dde29defbbffd182ab6d4644fdfcc080935ad2
Merge "remove some cruft (code hygiene)"