The update_mb_segmentation_map flag was being signalled earlier than
other data dependent on that flag. Consolidate this data so it's
parsed within the same if-scope as the flag is originally parsed in.
Change-Id: I10e90b4f511856445ef75a85a44ff441e1e5e672