Merge "Fix KeyboardLayoutSetSubtypesCountTests."