Merge "Revert "hnvram: rename hnvram binary""