Update api-tool submodules to 2.3.0-rc.21