Merge "Cleanup inside vp9_reconinter.c."