remove qcom define from surround out