Make sure the removal of deprecated APIs TextSelectionControls.buildToolbar and TextSelectionHandleControls happen in two separate steps.  Will make a tricky migration situation a little easier for affected users.