backing out bug 978507, sha - df0fdd892133, commit based off wrong patch
Bug 978507 - for mozharness desktop builds, replace usage of client.mk with upcoming mach/python script - correct patch, r=aki