Merge "dex2oat: Accept .dm files." am: 21dca73964
am: 773a9e8396

Change-Id: If5b421291a11c4a79114878ea30a9a83c0f98995