merging in aosp - breaks bluetooth
revert hw/ bluetooth to fix broken bluetooth