am d5d4facf: am 61fdf5bc: Merge "art: Fix broken cmdline_parser_test"

* commit 'd5d4facf59fcbdf85aeff040c37b20747e991796':
  art: Fix broken cmdline_parser_test