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

This reverts commit 41891f2f87d6304410776e043d53b36a13f26cad.