Merge "Testrunner: Fix concurrecy for --target" am: b75e66e763 am: d9541ddc00
am: 7345816146

Change-Id: I1e2e9e8e376730ebfda7cd8ae9809daf7a148367