am 21a4ccc6: (-s ours) Merge "Add extras required for compilation" into ub-launcher3-almonte

* commit '21a4ccc6275a6a3328fc4951f6942b43b0a7726b':
  Add extras required for compilation