Merged XPERT as a build component with jovaldi.