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

* commit '19929654ddf3bce1b89db92a9b7fb47d6e91e2f8':
  art: Try to fix parsed_options_test on the build server