Merge "Setup make icon-loader library Bug: 115891474" into ub-launcher3-master