Adjust handling of --target-buildid for usage with Mozmill CI (#186)

(cherry picked from commit 2d6be9a00343e3695f428db6f939d3a4fbd3c12e)