Merge "Add application image dex2oat options" am: 49560fcce5
am: 08e679a904

* commit '08e679a904980b81cb55699345a5555ec5ea3733':
  Add application image dex2oat options