Merge "msm7630_surf: Use #if instead of #ifdef"