Merge "Modify bluetooth test target for new Instrumentation test location"