Merge "Build rule cleanup" into ub-launcher3-master