Revert "Bug 913782 - [Keyboard] Build time default keyboard selection work for"

This reverts commit 8225770e82b105f45b6b85be382bae94615b4fd1.