Merge "Bluetooth: hci_ath: Remove un-used variable" into msm-3.4