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

Change-Id: I4da9d4d9e12a0d825e01993f8eed0209a7aed7ef