Fix setup.py handling of CLI options for --cmake_options and --make_options