Merge "Change the instrumentation app build target type"