builder: Fix CMD to inject /bin/sh -c when provided with a non-json value.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Merge pull request #8284 from erikh/fix_cmd_again

builder: Fix CMD to inject /bin/sh -c when provided with a non-json value