Merge "Remove dependency on TreeMap from getSortedInputMethodAndSubtypeList()"