Clean up Bluetooth test code.

Change-Id: I502b03df842c628c7b504e2a32a17bce6d25b4f8
2 files changed