Merge "Rename so -> scan_order in vp9_encodemb.c"