Merge "Revamp dexlayout writing functions"
am: b3c0c8086f

Change-Id: I086f292382c731e7bd1d14687cea53ddaa54db5a