Revert "Disable QCOM_BSP for now"

This reverts commit c1ed3bd0c33c316eed01a987d4d2a4a2f203b667.
Merge branch 'cm-11.0' into martincz