am 5e36c123: am 2492327c: fix broken incremental builds due to some voicesearch change.
am 5e36c123: am 2492327c: fix broken incremental builds due to some voicesearch change.

Merge commit '5e36c1232d9c29f07909f82e7385a7818fdcc468'

* commit '5e36c1232d9c29f07909f82e7385a7818fdcc468':
  fix broken incremental builds due to some voicesearch change.

Hybrid-Power/startsync,xorware/android_build,xorware/android_build,ND-3500/platform_manifest,hagar006/platform_manifest,knone1/platform_manifest,see4ri/lolili,pranav01/platform_manifest,xorware/android_build,xorware/android_build,fallouttester/platform_manifest,xorware/android_build,RR-msm7x30/platform_manifest