Merge "Revert "Remove outdated emulator check which causes BT to not start"" am: 375ea2ae71
am: ebc05de919

Change-Id: Id61ee53f3147d90d8fbca053633e3115b69d3065