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

* commit '61fdf5bca503c30ba1e4dcaf333a8d3299f3bde6':
  art: Fix broken cmdline_parser_test