Merge "Modify bluetooth test target for new Instrumentation test location"
am: bf27b31416

Change-Id: I166e76b7e08a487d76c085ec511ecf5dcc7a7205