Revert "Use custom generic kaylayout"

This reverts commit 03f0d71ca71a25c763a66e311151b874af94351c.

Useless as the build system replaces it again with original

Change-Id: I221122c7ed03602b985b78dd933cbc3e91b432aa
CM Performance profiles

Change-Id: I45602fbe83e3be30c0c71b5c97f9336ff9fbadb1