Track External Bluetooth Upstream

All we do is merge cm into it so lets just track it upstream