Merge "art: Fix broken cmdline_parser_test"