Merge "hal: update structure packing for decoders"