Merge "highbd x86: consolidate tran_low_t conversions"