Merge "s6: update gen_scs scripts for new key dir naming [1/1]" into amlogic-dev