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

Change-Id: I70910f5d41d63b434d529f993e3fc36199820e23