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

Change-Id: Ia518b5298898e69d6d79ac74ed273589e7bea529