Merge "Refactor prediction functions of OBMC" into nextgenv2