am 049c97bb: Merge "Rename search_engines.xml to keep translation imports from overwriting it." into gingerbread

Merge commit '049c97bb596e740f625b0d52d654095423b88a73' into gingerbread-plus-aosp

* commit '049c97bb596e740f625b0d52d654095423b88a73':
  Rename search_engines.xml to keep translation imports from overwriting it.