Merge "vp9_encodemv.h: fix function prototype"