system/nvram: fix typos and clang-tidy warnings am: e52a7f4add am: 8b25264d34
am: 48d690c224

Change-Id: I5cfed5e9b411da37a9395d2419f1343daa679dbd