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

Change-Id: Id3b329a83518a7eb49abf493e125b8f8df5a469d