Move QCOM_BSP up to family

Change-Id: I5d25c59db4bd4a785379abbfc218e97eb4d7b683
Merge branch 'cm-11.0' into martincz