Merge change 25270 into eclair

* changes:
  Use Resources to load search icons with android.resource URIs