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

Merge commit '4011106fcd18cb6d6179e707636b836a29220c3f'

* commit '4011106fcd18cb6d6179e707636b836a29220c3f':
  Rename search_engines.xml to keep translation imports from overwriting it.