am 52a87a4c: Merge "Clean up KeyboardLayoutSet a bit"

* commit '52a87a4cc3b8ab1bda15b21cc1749d3a8addd45f':
  Clean up KeyboardLayoutSet a bit