Change bluetooth to aosp and update branches