Merge "art: Try to fix parsed_options_test on the build server"