Merge "Revamp dexlayout writing functions"