Merge "vp9_rdopt: fix integer sanitizer warnings"