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

Change-Id: Ic0e8e15d3c5d9b673e223052ba448e182f733496