Merge remote-tracking branch 'caf/kk_rb1.11' into HEAD
bluedroid: remove duplicate BLUETOOTH_QCOM_SW define

Change-Id: I9b9f9fe825999f731cbcd999d59f2fc07fc764bf