Revert "Revert "Follow CyanogenMod Bluetooth packages""

This reverts commit 6a707c7ba198f1fa5b4d753784a69cfcef083af7.

Change-Id: Id677526cd255ec4a69627e974ac3c37a2a6f3fd8
Merge "Revert "Revert "Follow CyanogenMod Bluetooth packages""" into kitkat