Fix QCOM_BSP ifdef

Change-Id: Ibeee2edadcf03b92f31cf3af3c0be0e2e0af023d
Merge remote-tracking branch 'cm/cm-11.0' into HEAD