new_variant: clean up variant data

Allow 'None' defaults for cb_config_dir, the FSP/fitimage related
data, and private_yaml_dir. Remove these from variants where the
'None' default is correct.
Remove outdated fields and duplicates from variant data.
Make changes in format strings and if/return/else to fix warnings
from `cros lint`.

BUG=b:158033185
TEST=Use new_variant.py to start a new variant of Hatch, Volteer,
Waddledee (Dedede), and Trembyle (Zork). Name the variant "nonesuch"
so that the Volteer, Dedede, and Zork builds will fail in the first
step (build_config). Hatch will stop for fitimage generation. When
the program stops, examine ~/.new_variant.yaml and observe that
unused keys are still present, e.g. `private_yaml_dir: null`.
Use --abort to discard all changes.
The fact that the program got through the initial load of the
variant's data files (e.g. hatch.py) instead of failing for a
missing key shows that the default setting works.

Change-Id: I807ba15593d2877d39470aa9cd50dd55168316aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2227337
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
5 files changed