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

Change-Id: I52ced37152212d3864e0d9de10d28b10a1e95e52