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

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