Switch to using 'p4_build_cmd'