am dd03c613: resolved conflicts for merge of 081a136d to eclair

Merge commit 'dd03c6135f91df6d5d9e71de1487520dc3345742' into eclair-plus-aosp

* commit 'dd03c6135f91df6d5d9e71de1487520dc3345742':
  Remove third party support for Quick Search Box (aka global search).