Clean up the mess left by merging the motion compensation arm64 neon code