Merge "keymaster_benchmark: remove usage of base::CommandLine" into main