Merge "Add extras required for compilation" into ub-launcher3-almonte