Merge "Revert "Revert "Add dex file writer to dexlayout tool.""" am: 765dee21f3
am: 6449dd7204

Change-Id: I25418a101bbb4fd15a03bbf8e27d08bc63da7e68