Merge "Modify bluetooth test target for new Instrumentation test location" am: bf27b314 am: 134ddc81 am: a4f37279 Change-Id: I17922ba301e441245645adda548d46ed230e5bd1