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

Change-Id: I17922ba301e441245645adda548d46ed230e5bd1