Merge "variance_test: fix build w/--disable-vp8-encoder"