Merge pull request #1791 from billhollings/msl-out-of-order-struct-offsets

MSL: Fix type redirection when struct members are reordered to align with offsets.