Merge "Restore lost .dm support of adb install-multiple"