Merge "Revert "Add dex file writer to dexlayout tool.""