Merge "Revert "Add dex file writer to dexlayout tool.""
am: 148768f51e

Change-Id: I0a9e96f33e5be196fd5631bd58acd05de9e5a697