use aries keylayout and remove idc

Change-Id: I738e452e350266934aaee6187cc886fe83b38c6a