Merge "synquacer: Fix compilation fail for SPM support build config" into integration