Merge "Remove outdated emulator check which causes BT to not start" am: ad7fb62d4f
am: 806ac5e1dd

Change-Id: I05b90b0f77fa74268f2f92bfa2e4decec3af5745