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

* commit '49560fcce5b9a07108f7cc75a3fb0fa265e5fa0e':
  Add application image dex2oat options