am 59d34087: Merge "Fix KeyboardLayoutSetSubtypesCountTests."

* commit '59d3408727488d461fc45f2131ad81124d035dd1':
  Fix KeyboardLayoutSetSubtypesCountTests.