Merge "armada-app: fix build failure on centos"