amzn: avoid sprinkling ifdefs and use flags#2636

igaw merged 1 commit intolinux-nvme:masterlinux-nvme/nvme-cli:masterfrom

ikegami-t:amzn-json-fixikegami-t/nvme-cli:amzn-json-fixCopy head branch name to clipboard