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

Change-Id: Ia8013df96a788dcb5d6077b41de02041d0e3c579