Merge "Revert "Add VP9 inter-frame prediction intrinsic""