Merge change 25366 into eclair

* changes:
  do not merge.  Revert "do not merge.  Remove voicesearch-specific functionality from framework."