am 4346564c: Fix Google suggest and search URLs when Google Search is not installed

Merge commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019' into gingerbread

* commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019':
  Fix Google suggest and search URLs when Google Search is not installed