Merge branch 'kk_2.7_rb1.15' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0

Change-Id: I6cf1bf597ab2105dee24bb4cb64d3719e063ab92