Merge 5fc551d1a8077b32819c77e5113c5b517095e771 on remote branch

Change-Id: I55d4019912930a04762f07c9638ab9b1b03d02ba
tree: f10e837e6886fcd6402c082c296bf68a30cfec27
  1. iconloaderlib/
  2. searchuilib/