Revert "Follow CyanogenMod Bluetooth packages"

This reverts commit f2128113ce9e8d4320db2c3938e658d7de62ec38.

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