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

* commit 'fa0bdd878ca53d85687f18539b9b3a6ab5349c1a':
  Add application image dex2oat options