Merge "Add basic support for writing cdex container in dexlayout"
am: 9e842d3e7d

Change-Id: I6ed94f2f2f678682562fd5c4eac22df0a769e8de