Merge "Add basic support for writing cdex container in dexlayout" am: 9e842d3e am: 21f873e5 am: ce2fa5db am: 90bff3c4 Change-Id: I87bb6c426d1522d607c5a3c8b5a9d0869016c1cf