Merge "Move libicing.so out of /usr/lib, into the appsearch apex." into sc-dev