Merge "Use new merge-signatures metalava subcommand" into main