Merge "Revert "Add dex file writer to dexlayout tool."" am: 148768f5 am: a2f2e103 am: f652164b am: 4fba08b7 Change-Id: I484e0cd8ca334732d7e60b00bb47dede6894a0ff