am c2211829: Merge change 26166 into eclair

Merge commit 'c2211829ac225786985d77a73049413022a65b71' into eclair-plus-aosp

* commit 'c2211829ac225786985d77a73049413022a65b71':
  Add a cleanspec entry for the VoiceSearch breakage that works.