Follow CyanogenMod Bluetooth packages

Change-Id: I172374ce51b208337097c5060fc2fa9c7edad478