Merge "Strip image-format arg in dex2oat" am: 6006e2ce92
am: 3ae8e105d7

* commit '3ae8e105d7f1ec67a0f4e237a29db30d32f66cb1':
  Strip image-format arg in dex2oat