Remove QCOM_BSP from here for now

Change-Id: I0482aaf67b9f60946d5f0bac9906b94d66bab6f5
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2