m4: Remove stale keylayout annotations

Change-Id: Ia818050f4e1ba1996e08899ef98f3b391d5f3ce9
Merge remote-tracking branch 'cm/cm-12.0' into HEAD