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.