Merge "Fix the non-ANW video decode path."