am f4d7c620: Include WebSearchProvider in all builds.

Merge commit 'f4d7c620f158d70ac21db7a89cbb391a01bd6848'

* commit 'f4d7c620f158d70ac21db7a89cbb391a01bd6848':
  Include WebSearchProvider in all builds.