Merge "Removing redundant "8x8" suffix from MODE_INFO vars."