Use master branch of aosp for bluetooth, hopefully this fixes it