Merge "Bluetooth: hci_ldisc: watchdog timeout while BT file transfer" into msm-3.4