[genlist, gen, gen_common] merge upstream except for elm_genlist.c