Fix v4l2 tests after recent refactorings
am: 47d00e9608

Change-Id: I8aed751f5bba35259c571fd9f6e007740ae491b2