Merge "Revert "fix keytests for azerty keyboard"" into froyo