Merge branch 'kitkat' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0

Change-Id: If4406c5f5c7e2e05395805251f97a9b80e83b4e6
Merge branch 'kk_rb1.7' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0