Merge "Strip image-format arg in dex2oat"