Merge "Fix segmentation updates with vp8_set_roimap()"