Merge "Revert "Remove outdated emulator check which causes BT to not start""