Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-13.0

Change-Id: Ie7cbd6420cd272d9cd0b98f6c763654c6104bb55