Bug 1010119 - Roll back part of bug 978248 as it causes a regression and is not needed any more. r=botond, a=1.4+
Bug 1005901 - [bluedroid] Always do cleanup after disable. r=btian, a=1.4+
Bug 1003472 - If OPP manager can't get valid service channel, refresh SDP records until timeout is hit. r=shuang, a=1.4+

If user tries to send a file to a device which just completes the pairing
process, the OPP manager may update SDP records when it's not ready.

It's especially likely to occur in BT file transfer with inline pairing
since OPP manager would request for a service channel to send the file when
device is just paired.
Bug 1003247 - Ensure to setExtraHostRoute() after setAndConfigureActive() is done. r=vyang, a=1.3+