Remove stale keylayout annotations

Change-Id: Iaa75dae6ba40c70f4473ae6d6aed56a424a48fc9