tenderloin:  Update can clean keylayouts and keychars

Change-Id: I1525761f803ad2c0a440b47d23e8292cdbb017ff