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

* commit '6006e2ce92fd86fdf028cd7b3afe972815b0e0f3':
  Strip image-format arg in dex2oat