merged from mainn, option.h aligned, EVS-mono comment removed in cng_dec.c