Merge "Fixed an encoder debug/relese mismatch in x86_64-win64-vs8"