Fixup Bluetooth.apk by rebasing with CM bluetooth.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Iabc76193375bf6d1656d2e01a5a34cd0394fcf9f