Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I11a3aa23392b12f83d49fe64c3c208daa980e8dd
Change-Id: I6e16664c4e339adb76f30f27a44a2d85ea07f24d
tree: aea03753ccdc4aeb3d5914b9eb75c65ea8f5899e
  1. iconloaderlib/
  2. searchuilib/