Move small fixes and refactoring for obmc pred from AV1

Covering commits 1c263e0 and 79d8a07 from AOM codebase

Change-Id: I6400e5f99bbb2ef6584ef232d465e520230c06e0
4 files changed